Merge pull request #19686 from colemanw/searchKitClearSelection

SearchKit - Fix clearing selection behavior
civicrm · Feb 27, 2021 · e0a95fa · e0a95fa
2 parents 97032c8 + 3b80106
commit e0a95fa
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js b/ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js
@@ -520,7 +520,7 @@
 
       this.refreshAll = function() {
         ctrl.stale = true;
-        ctrl.selectedRows.length = 0;
+        clearSelection();
         loadResults();
       };
 
@@ -577,17 +577,21 @@
 
       function onChangeFilters() {
         ctrl.stale = true;
-        ctrl.selectedRows.length = 0;
+        clearSelection();
         if (ctrl.autoSearch) {
           ctrl.refreshAll();
         }
       }
 
+      function clearSelection() {
+        ctrl.allRowsSelected = false;
+        ctrl.selectedRows.length = 0;
+      }
+
       $scope.selectAllRows = function() {
         // Deselect all
         if (ctrl.allRowsSelected) {
-          ctrl.allRowsSelected = false;
-          ctrl.selectedRows.length = 0;
+          clearSelection();
           return;
         }
         // Select all