Merge branch '5.31' into master

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

diff --git a/ext/search/ang/searchAdmin/crmSearch.component.js b/ext/search/ang/searchAdmin/crmSearch.component.js
index 19e049ee81f6ff28f30149abc42d60b6f2f7c8b0..26b561a92d492d10a8b0dc0116458dc85ab189e3 100644 (file)
--- a/ext/search/ang/searchAdmin/crmSearch.component.js
+++ b/ext/search/ang/searchAdmin/crmSearch.component.js
@@ -27,7 +27,7 @@
 
       $scope.controls = {};
       $scope.joinTypes = [{k: false, v: ts('Optional')}, {k: true, v: ts('Required')}];
-      $scope.entities = formatForSelect2(CRM.vars.search.schema, 'name', 'titlePlural', ['description', 'icon']);
+      $scope.entities = formatForSelect2(CRM.vars.search.schema, 'name', 'title_plural', ['description', 'icon']);
       this.perm = {
         editGroups: CRM.checkPerm('edit groups')
       };
@@ -44,7 +44,7 @@
           if (entity) {
             joinEntities.push({
               id: link.entity + ' AS ' + link.alias,
-              text: entity.titlePlural,
+              text: entity.title_plural,
               description: '(' + link.alias + ')',
               icon: entity.icon
             });
@@ -428,7 +428,7 @@
 
         var mainEntity = searchMeta.getEntity(ctrl.entity),
           result = [{
-            text: mainEntity.titlePlural,
+            text: mainEntity.title_plural,
             icon: mainEntity.icon,
             children: formatFields(ctrl.entity, '')
           }];
@@ -436,7 +436,7 @@
           var joinName = join[0].split(' AS '),
             joinEntity = searchMeta.getEntity(joinName[0]);
           result.push({
-            text: joinEntity.titlePlural + ' (' + joinName[1] + ')',
+            text: joinEntity.title_plural + ' (' + joinName[1] + ')',
             icon: joinEntity.icon,
             children: formatFields(joinEntity.name, joinName[1] + '.')
           });