fix(groupRow): table columns are lost when switching between groups

esvit · Aug 28, 2015 · 6d2c735 · 6d2c735
1 parent 7b30995
commit 6d2c735
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/scripts/ngTableGroupRowController.js b/src/scripts/ngTableGroupRowController.js
@@ -66,21 +66,19 @@
         }
 
         function groupBy(group){
-            if (group.groupable){
-                if (group.groupable($scope) === $scope.$selGroup){
-                    changeSortDirection();
-                } else {
-                    var existingGroupCol = findGroupColumn($scope.$selGroup);
-                    if (existingGroupCol && existingGroupCol.show.assign && group.show.assign){
-                        existingGroupCol.show.assign($scope, true);
+            if (isSelectedGroup(group)){
+                changeSortDirection();
+            } else {
+                var existingGroupCol = findGroupColumn($scope.$selGroup);
+                if (existingGroupCol && existingGroupCol.show.assign){
+                    existingGroupCol.show.assign($scope, true);
+                }
+                if (group.groupable){
+                    if (group.show.assign){
                         group.show.assign($scope, false);
                     }
                     $scope.params.group(group.groupable($scope));
-                }
-            } else{
-                if (group === $scope.$selGroup){
-                    changeSortDirection();
-                } else {
+                } else{
                     $scope.params.group(group);
                 }
             }