From b0422f121fb42960e57ca9fa01466ca35a6ae7a9 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 9 Jul 2020 11:38:30 -0400 Subject: [PATCH] Rename searchBuild to less ambiguous Create Search --- ext/search/CRM/Search/Upgrader.php | 6 +++--- ext/search/README.md | 4 ++-- ext/search/ang/search.module.js | 2 +- ...archBuild.component.js => crmSearch.component.js} | 4 ++-- .../search/{crmSearchBuild.html => crmSearch.html} | 12 ++++++------ .../{crmSearchBuild => crmSearch}/controls.html | 0 .../build.html => crmSearch/criteria.html} | 0 .../search/{crmSearchBuild => crmSearch}/debug.html | 0 .../search/{crmSearchBuild => crmSearch}/pager.html | 0 .../{crmSearchBuild => crmSearch}/results.html | 0 ext/search/ang/search/crmSearchActions.component.js | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) rename ext/search/ang/search/{crmSearchBuild.component.js => crmSearch.component.js} (99%) rename ext/search/ang/search/{crmSearchBuild.html => crmSearch.html} (52%) rename ext/search/ang/search/{crmSearchBuild => crmSearch}/controls.html (100%) rename ext/search/ang/search/{crmSearchBuild/build.html => crmSearch/criteria.html} (100%) rename ext/search/ang/search/{crmSearchBuild => crmSearch}/debug.html (100%) rename ext/search/ang/search/{crmSearchBuild => crmSearch}/pager.html (100%) rename ext/search/ang/search/{crmSearchBuild => crmSearch}/results.html (100%) diff --git a/ext/search/CRM/Search/Upgrader.php b/ext/search/CRM/Search/Upgrader.php index d42a70f862..8634e2a649 100644 --- 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 ab3e537391..456e59f4f8 100644 --- 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 ca99534ae1..433383ed68 100644 --- 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: '', + template: '', 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 972863a703..9d5673eab5 100644 --- 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 f236894013..bd0feabcba 100644 --- a/ext/search/ang/search/crmSearchBuild.html +++ b/ext/search/ang/search/crmSearch.html @@ -1,5 +1,5 @@ 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 7e88e2812e..138cb089a9 100644 --- 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) { -- 2.25.1