fix(core/clusterFilter): Use filterModel object to retrieve filter va…

…lues (#8693) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
spinnaker · Oct 28, 2020 · 62b81bf · 62b81bf
1 parent 4a4f472
commit 62b81bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/scripts/modules/core/src/cluster/allClusters.controller.js b/app/scripts/modules/core/src/cluster/allClusters.controller.js
@@ -41,7 +41,7 @@ module(CORE_CLUSTER_ALLCLUSTERS_CONTROLLER, [
       this.dataSource = app.getDataSource('serverGroups');
       this.application = app;
 
-      $scope.sortFilter = ClusterState.filterModel.sortFilter;
+      $scope.filterModel = ClusterState.filterModel;
 
       this.createLabel = 'Create Server Group';
 

diff --git a/app/scripts/modules/core/src/cluster/allClusters.html b/app/scripts/modules/core/src/cluster/allClusters.html
@@ -4,7 +4,7 @@
       <div class="form-group">
         <button
           class="btn btn-xs btn-default"
-          ng-class="{active: sortFilter.multiselect}"
+          ng-class="{active: filterModel.sortFilter.multiselect}"
           ng-click="ctrl.toggleMultiselect()"
         >
           <span class="glyphicon glyphicon-list visible-lg-inline"></span>
@@ -18,17 +18,17 @@
           <label>
             <input
               type="checkbox"
-              ng-model="sortFilter.showAllInstances"
+              ng-model="filterModel.sortFilter.showAllInstances"
               ng-change="ctrl.syncUrlAndUpdateClusterGroups()"
             />
             Instances
           </label>
         </div>
-        <div class="checkbox" is-visible="sortFilter.showAllInstances">
+        <div class="checkbox" is-visible="filterModel.sortFilter.showAllInstances">
           <label>
             <input
               type="checkbox"
-              ng-model="sortFilter.listInstances"
+              ng-model="filterModel.sortFilter.listInstances"
               ng-change="ctrl.syncUrlAndUpdateClusterGroups()"
             />
             with details