Merge pull request angular-ui#5018 from AdiDahan/fix-3646

feature(treeGrid): fix angular-ui#3646 - allow to disable expand all button
michalgm · Jan 30, 2016 · 6709846 · 6709846
2 parents 74ef171 + 0c044ca
commit 6709846
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/features/tree-base/js/tree-base.js b/src/features/tree-base/js/tree-base.js
@@ -525,6 +525,16 @@
          *  <br/>Defaults to {}
          */
         gridOptions.treeCustomAggregations = gridOptions.treeCustomAggregations || {};
+
+        /**
+         *  @ngdoc object
+         *  @name enableExpandAll
+         *  @propertyOf  ui.grid.treeBase.api:GridOptions
+         *  @description Enable the expand all button at the top of the row header
+         *
+         *  <br/>Defaults to true
+         */
+        gridOptions.enableExpandAll = gridOptions.enableExpandAll !== false;
       },
 
 

diff --git a/src/features/tree-base/templates/treeBaseHeaderCell.html b/src/features/tree-base/templates/treeBaseHeaderCell.html
@@ -2,7 +2,8 @@
   <div
     class="ui-grid-cell-contents"
     col-index="renderIndex">
-    <ui-grid-tree-base-expand-all-buttons>
+    <ui-grid-tree-base-expand-all-buttons
+            ng-if="grid.options.enableExpandAll">
     </ui-grid-tree-base-expand-all-buttons>
   </div>
 </div>
diff --git a/src/features/tree-base/test/tree-base.spec.js b/src/features/tree-base/test/tree-base.spec.js
@@ -86,7 +86,8 @@ describe('ui.grid.treeBase uiGridTreeBaseService', function () {
         showTreeRowHeader: true,
         showTreeExpandNoChildren: true,
         treeRowHeaderAlwaysVisible: true,
-        treeCustomAggregations: {}
+        treeCustomAggregations: {},
+        enableExpandAll: true
       });
     });
   });