SearchKit - Fix wrong flags shown when switching field functions

diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchFunctionFlag.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchFunctionFlag.component.js
index ee6948ada5847519c29297e1986340b6d02f38ed..24db599dd31e4c092add257d6cfc0b42cf1610d9 100644 (file)
--- a/ext/search_kit/ang/crmSearchAdmin/crmSearchFunctionFlag.component.js
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchFunctionFlag.component.js
@@ -13,13 +13,13 @@
       var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
         ctrl = this;
 
-      this.$onInit = function() {
+      this.getWidget = function() {
         if (!ctrl.param || !ctrl.param[ctrl.flag]) {
-          this.widget = null;
+          return null;
         } else if (_.keys(ctrl.param[ctrl.flag]).length === 2 && '' in ctrl.param[ctrl.flag]) {
-          this.widget = 'checkbox';
+          return 'checkbox';
         } else {
-          this.widget = 'select';
+          return 'select';
         }
       };
     }

diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchFunctionFlag.html b/ext/search_kit/ang/crmSearchAdmin/crmSearchFunctionFlag.html
index f2227e5eeda8c305c74d4b0b9ad19ff42b5333f4..32a126b0fda5f8c9f89bf62520872413a3de17ff 100644 (file)
--- a/ext/search_kit/ang/crmSearchAdmin/crmSearchFunctionFlag.html
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchFunctionFlag.html
@@ -1,4 +1,4 @@
-<span ng-switch="$ctrl.widget">
+<span ng-switch="$ctrl.getWidget()">
   <span ng-switch-when="checkbox">
     <label ng-repeat="(val, label) in $ctrl.param[$ctrl.flag]" ng-if="val">
       <input type="checkbox" ng-checked="$ctrl.arg[$ctrl.flag] === val" ng-click="$ctrl.arg[$ctrl.flag] = ($ctrl.arg[$ctrl.flag] === val ? null : val); $ctrl.writeExpr();" >