Rename searchBuild to less ambiguous Create Search

diff --git a/ext/search/CRM/Search/Upgrader.php b/ext/search/CRM/Search/Upgrader.php
index d42a70f8622617da8539f6067d5417ec2ad33478..8634e2a649b47763108492bfc940693565737dae 100644 (file)
--- a/ext/search/CRM/Search/Upgrader.php
+++ b/ext/search/CRM/Search/Upgrader.php
@@ -13,8 +13,8 @@ class CRM_Search_Upgrader extends CRM_Search_Upgrader_Base {
     \Civi\Api4\Navigation::create()
       ->setCheckPermissions(FALSE)
       ->addValue('parent_id:name', 'Search')
-      ->addValue('label', E::ts('Build Search for...'))
-      ->addValue('name', 'build_search')
+      ->addValue('label', E::ts('Create Search...'))
+      ->addValue('name', 'create_search')
       ->addValue('url', 'civicrm/search')
       ->addValue('icon', 'crm-i fa-search-plus')
       ->addValue('has_separator', 2)
@@ -28,7 +28,7 @@ class CRM_Search_Upgrader extends CRM_Search_Upgrader_Base {
   public function disable() {
     \Civi\Api4\Navigation::delete()
       ->setCheckPermissions(FALSE)
-      ->addWhere('name', '=', 'build_search')
+      ->addWhere('name', '=', 'create_search')
       ->addWhere('domain_id', '=', 'current_domain')
       ->execute();
   }

diff --git a/ext/search/README.md b/ext/search/README.md
index ab3e5373917270866ae5bb9c1f1b75c7baedcc15..456e59f4f8e17d5dd01f5ac4e5549c124e2f6303 100644 (file)
--- a/ext/search/README.md
+++ b/ext/search/README.md
@@ -1,7 +1,7 @@
 # org.civicrm.search
 
-A core extension to build advanced searches.
+A core extension to create advanced searches.
 
 ## Usage
 
-Once enabled, navigate to **Search > Build Search for...** in the menu.
+Once enabled, navigate to **Search > Create Search...** in the menu.

diff --git a/ext/search/ang/search.module.js b/ext/search/ang/search.module.js
index ca99534ae1bfd230a816ae010d87ebff15866644..433383ed68aaa3a8d81363ff62cf3a0e90d8220d 100644 (file)
--- a/ext/search/ang/search.module.js
+++ b/ext/search/ang/search.module.js
@@ -10,7 +10,7 @@
     .config(function($routeProvider) {
       $routeProvider.when('/:entity', {
         controller: 'searchRoute',
-        template: '<div id="bootstrap-theme" class="crm-search"><crm-search-build entity="entity"></crm-search-build></div>',
+        template: '<div id="bootstrap-theme" class="crm-search"><crm-search entity="entity"></crm-search></div>',
         reloadOnSearch: false
       });
     })

diff --git a/ext/search/ang/search/crmSearchBuild.component.js b/ext/search/ang/search/crmSearch.component.js
similarity index 99%
rename from ext/search/ang/search/crmSearchBuild.component.js
rename to ext/search/ang/search/crmSearch.component.js
index 972863a7031e9b48fa8a616beae17fa454da751b..9d5673eab54492887ff295c8909daf5b65090632 100644 (file)
--- a/ext/search/ang/search/crmSearchBuild.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -1,11 +1,11 @@
 (function(angular, $, _) {
   "use strict";
 
-  angular.module('search').component('crmSearchBuild', {
+  angular.module('search').component('crmSearch', {
     bindings: {
       entity: '='
     },
-    templateUrl: '~/search/crmSearchBuild.html',
+    templateUrl: '~/search/crmSearch.html',
     controller: function($scope, $element, $timeout, crmApi4, dialogService, searchMeta, formatForSelect2) {
       var ts = $scope.ts = CRM.ts(),
         ctrl = this;

diff --git a/ext/search/ang/search/crmSearchBuild.html b/ext/search/ang/search/crmSearch.html
similarity index 52%
rename from ext/search/ang/search/crmSearchBuild.html
rename to ext/search/ang/search/crmSearch.html
index f2368940133d9f30cda247793ca8da6dd3ad9d20..bd0feabcba10f045de80214f40fd56b556c5133d 100644 (file)
--- a/ext/search/ang/search/crmSearchBuild.html
+++ b/ext/search/ang/search/crmSearch.html
@@ -1,5 +1,5 @@
 <div id="bootstrap-theme" class="crm-search">
-  <h1 crm-page-title>{{:: ts('Build Search for %1', {1: $ctrl.getEntity($ctrl.entity).title}) }}</h1>
+  <h1 crm-page-title>{{:: ts('Create Search for %1', {1: $ctrl.getEntity($ctrl.entity).title}) }}</h1>
 
   <!--This warning will show if bootstrap is unavailable. Normally it will be hidden by the bootstrap .collapse class.-->
   <div class="messages warning no-popup collapse">
@@ -11,10 +11,10 @@
   </div>
 
   <form>
-    <div ng-include="'~/search/crmSearchBuild/build.html'"></div>
-    <div ng-include="'~/search/crmSearchBuild/controls.html'"></div>
-    <div ng-include="'~/search/crmSearchBuild/debug.html'" ng-if="$ctrl.debug"></div>
-    <div ng-include="'~/search/crmSearchBuild/results.html'" class="crm-search-results"></div>
-    <div ng-include="'~/search/crmSearchBuild/pager.html'"></div>
+    <div ng-include="'~/search/crmSearch/criteria.html'"></div>
+    <div ng-include="'~/search/crmSearch/controls.html'"></div>
+    <div ng-include="'~/search/crmSearch/debug.html'" ng-if="$ctrl.debug"></div>
+    <div ng-include="'~/search/crmSearch/results.html'" class="crm-search-results"></div>
+    <div ng-include="'~/search/crmSearch/pager.html'"></div>
   </form>
 </div>

diff --git a/ext/search/ang/search/crmSearchBuild/controls.html b/ext/search/ang/search/crmSearch/controls.html
similarity index 100%
rename from ext/search/ang/search/crmSearchBuild/controls.html
rename to ext/search/ang/search/crmSearch/controls.html

diff --git a/ext/search/ang/search/crmSearchBuild/build.html b/ext/search/ang/search/crmSearch/criteria.html
similarity index 100%
rename from ext/search/ang/search/crmSearchBuild/build.html
rename to ext/search/ang/search/crmSearch/criteria.html

diff --git a/ext/search/ang/search/crmSearchBuild/debug.html b/ext/search/ang/search/crmSearch/debug.html
similarity index 100%
rename from ext/search/ang/search/crmSearchBuild/debug.html
rename to ext/search/ang/search/crmSearch/debug.html

diff --git a/ext/search/ang/search/crmSearchBuild/pager.html b/ext/search/ang/search/crmSearch/pager.html
similarity index 100%
rename from ext/search/ang/search/crmSearchBuild/pager.html
rename to ext/search/ang/search/crmSearch/pager.html

diff --git a/ext/search/ang/search/crmSearchBuild/results.html b/ext/search/ang/search/crmSearch/results.html
similarity index 100%
rename from ext/search/ang/search/crmSearchBuild/results.html
rename to ext/search/ang/search/crmSearch/results.html

diff --git a/ext/search/ang/search/crmSearchActions.component.js b/ext/search/ang/search/crmSearchActions.component.js
index 7e88e2812e9f10e2a407fb6817c627af7b8e0ab0..138cb089a9251a02a325c60ee5c8e6689fe34d96 100644 (file)
--- a/ext/search/ang/search/crmSearchActions.component.js
+++ b/ext/search/ang/search/crmSearchActions.component.js
@@ -7,7 +7,7 @@
       ids: '<'
     },
     require: {
-      search: '^crmSearchBuild'
+      search: '^crmSearch'
     },
     templateUrl: '~/search/crmSearchActions.html',
     controller: function($scope, crmApi4, dialogService, searchMeta) {