Merge branch '5.31' into master

[civicrm-core.git] / ext / search / ang / searchAdmin / crmSearch.component.js

diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/searchAdmin/crmSearch.component.js
similarity index 94%
rename from ext/search/ang/search/crmSearch.component.js
rename to ext/search/ang/searchAdmin/crmSearch.component.js
index 8bb66ef210b057d5b36ad5902562930aae6ab4e2..26b561a92d492d10a8b0dc0116458dc85ab189e3 100644 (file)
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/searchAdmin/crmSearch.component.js
@@ -1,12 +1,12 @@
 (function(angular, $, _) {
   "use strict";
 
-  angular.module('search').component('crmSearch', {
+  angular.module('searchAdmin').component('crmSearch', {
     bindings: {
       entity: '=',
       load: '<'
     },
-    templateUrl: '~/search/crmSearch.html',
+    templateUrl: '~/searchAdmin/crmSearch.html',
     controller: function($scope, $element, $timeout, crmApi4, dialogService, searchMeta, formatForSelect2) {
       var ts = $scope.ts = CRM.ts(),
         ctrl = this;
@@ -456,7 +456,7 @@
         function enqueue(entity) {
           entity.optionsLoaded = false;
           entities[entity.name] = [entity.name, 'getFields', {
-            loadOptions: CRM.vars.search.loadOptions,
+            loadOptions: ['id', 'name', 'label', 'description', 'color', 'icon'],
             where: [['options', '!=', false]],
             select: ['options']
           }, {name: 'options'}];
@@ -552,31 +552,6 @@
         loadFieldOptions();
       };
 
-      $scope.saveGroup = function() {
-        var model = {
-          title: '',
-          description: '',
-          visibility: 'User and User Admin Only',
-          group_type: [],
-          id: ctrl.load ? ctrl.load.id : null,
-          api_entity: ctrl.entity,
-          api_params: _.cloneDeep(angular.extend({}, ctrl.params, {version: 4}))
-        };
-        delete model.api_params.orderBy;
-        if (ctrl.load && ctrl.load.api_params && ctrl.load.api_params.select && ctrl.load.api_params.select[0]) {
-          model.api_params.select.unshift(ctrl.load.api_params.select[0]);
-        }
-        var options = CRM.utils.adjustDialogDefaults({
-          autoOpen: false,
-          title: ts('Save smart group')
-        });
-        dialogService.open('saveSearchDialog', '~/search/saveSmartGroup.html', model, options)
-          .then(function() {
-            if (ctrl.load) {
-              ctrl.load.saved = true;
-            }
-          });
-      };
     }
   });