Search ext: When removing a column from SELECT, also remove from ORDE…

…R BY
civicrm · Sep 18, 2020 · 7da9d07 · 7da9d07
1 parent 4fea3bf
commit 7da9d07
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
@@ -87,6 +87,9 @@
           ctrl.params.orderBy = {};
         }
         ctrl.params.orderBy[col] = dir;
+        if (ctrl.results) {
+          ctrl.refreshPage();
+        }
       };
 
       /**
@@ -233,6 +236,10 @@
       };
 
       function onChangeSelect(newSelect, oldSelect) {
+        // When removing a column from SELECT, also remove from ORDER BY
+        _.each(_.difference(_.keys(ctrl.params.orderBy), newSelect), function(col) {
+          delete ctrl.params.orderBy[col];
+        });
         // Re-arranging or removing columns doesn't merit a refresh, only adding columns does
         if (!oldSelect || _.difference(newSelect, oldSelect).length) {
           if (ctrl.autoSearch) {
@@ -243,12 +250,6 @@
         }
       }
 
-      function onChangeOrderBy() {
-        if (ctrl.results) {
-          ctrl.refreshPage();
-        }
-      }
-
       function onChangeFilters() {
         ctrl.stale = true;
         ctrl.selectedRows.length = 0;
@@ -480,7 +481,6 @@
           format: 'json',
           default: {}
         });
-        $scope.$watchCollection('$ctrl.params.orderBy', onChangeOrderBy);
 
         $scope.$bindToRoute({
           expr: '$ctrl.params.where',