Merge pull request Addepar#148 from LetsMakeDataEasy/group-row-contro…

…ll-flags Add group row control flags.
Gaurav0 · Oct 29, 2015 · 720323a · 720323a
2 parents d4fc8b2 + 45dd7c7
commit 720323a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/addon/controllers/group-row.js b/addon/controllers/group-row.js
@@ -26,6 +26,9 @@ var GroupRow = Row.extend({
     _childrenRow: null,
 
     expandChildren: function () {
+      if (this.get('_groupRowControlFlags.isEmpty')) {
+        return;
+      }
       this.set('isExpanded', true);
       this.createChildrenRow();
       var target = this.get('target');
@@ -43,6 +46,9 @@ var GroupRow = Row.extend({
     },
 
     collapseChildren: function () {
+      if (this.get('_groupRowControlFlags.isEmpty')) {
+        return;
+      }
       this.set('isExpanded', false);
       var target = this.get('target');
       if (target) {
@@ -199,7 +205,10 @@ var GroupRow = Row.extend({
       return this.get('grouping.isGrandTotal') ? this.get('grouping.grandTotalClass') : '';
     }),
 
-    hasChildren: Ember.computed('grouping.isGrandTotal', function() {
+    hasChildren: Ember.computed('grouping.isGrandTotal', '_groupRowControlFlags.isEmpty', function() {
+      if (this.get('_groupRowControlFlags.isEmpty')) {
+        return false;
+      }
       return this.get('grouping.isGrandTotal') || this.get('grouping.isGroup');
     }),
 

diff --git a/addon/views/grouping-column-cell.js b/addon/views/grouping-column-cell.js
@@ -25,9 +25,7 @@ export default TableCell.extend(
 
   _defaultGroupIndicatorViewName: 'grouped-row-indicator',
 
-  hasChildren: Ember.computed(function() {
-    return this.get('row.hasChildren') || this.get('groupingLevel') < this.get('tableComponent.groupingMetadata.length') - 1;
-  }).property('groupingLevel', 'tableComponent.groupingMetadata.length'),
+  hasChildren: Ember.computed.oneWay('row.hasChildren'),
 
   expandLevel: Ember.computed.oneWay('row.expandLevel'),