AdminUi - Switch to new toolbar setting for search displays

diff --git a/CRM/Financial/DAO/EntityFinancialAccount.php b/CRM/Financial/DAO/EntityFinancialAccount.php
index 9e7d4dfe6de566307053fb8d6785ff580f089b16..c64ef32a0543401f318194e4a6932dc6b924227e 100644 (file)
--- a/CRM/Financial/DAO/EntityFinancialAccount.php
+++ b/CRM/Financial/DAO/EntityFinancialAccount.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/EntityFinancialAccount.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:56a06273eec47f43f5671cb6152b7747)
+ * (GenCodeChecksum:73bd55d66da916d2b27113d0cd8ca6f7)
  */
 
 /**
@@ -31,6 +31,17 @@ class CRM_Financial_DAO_EntityFinancialAccount extends CRM_Core_DAO {
    */
   public static $_log = TRUE;
 
+  /**
+   * Paths for accessing this entity in the UI.
+   *
+   * @var string[]
+   */
+  protected static $_paths = [
+    'add' => 'civicrm/admin/financial/financialType/accounts?action=add&reset=1&aid=[entity_id]',
+    'update' => 'civicrm/admin/financial/financialType/accounts?action=update&id=[id]&aid=[entity_id]&reset=1',
+    'delete' => 'civicrm/admin/financial/financialType/accounts?action=delete&id=[id]&aid=[entity_id]&reset=1',
+  ];
+
   /**
    * ID
    *

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_ACL_Roles.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_ACL_Roles.mgd.php
index d139ac217e606912d8c9ca95f4de2b8a0afa2c01..bd8af2a789f5e0967b8ee2eddec52fc644a20f12 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_ACL_Roles.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_ACL_Roles.mgd.php
@@ -178,10 +178,15 @@ return [
               FALSE,
             ],
           ],
-          'addButton' => [
-            'path' => 'civicrm/acl/entityrole/edit?reset=1&action=add',
-            'text' => E::ts('Add ACL Role Assignment'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'ACLEntityRole',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add ACL Role Assignment'),
+              'icon' => 'fa-plus',
+            ],
           ],
         ],
         'acl_bypass' => FALSE,

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php
index 151554964022b8f5a58b181b568be60fa5e84422..54401dfa355fd876522a0de1db46d218eef77af5 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php
@@ -164,10 +164,15 @@ return [
               FALSE,
             ],
           ],
-          'addButton' => [
-            'path' => 'civicrm/admin/financial/financialType/accounts?action=add&reset=1&aid=[entity_id]',
-            'text' => E::ts('Add Assigned Account'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'EntityFinancialAccount',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Assigned Account'),
+              'icon' => 'fa-plus',
+            ],
           ],
         ],
         'acl_bypass' => FALSE,

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Contact_Types.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Contact_Types.mgd.php
index af94d309c70010709208bb8f587bc54c00c15afb..315d6bcc23564efb11a219fe9bc9903afadec97a 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Contact_Types.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Contact_Types.mgd.php
@@ -145,10 +145,15 @@ return [
               'alignment' => 'text-right',
             ],
           ],
-          'addButton' => [
-            'path' => 'civicrm/admin/options/subtype/edit?action=add&reset=1',
-            'text' => E::ts('Add Contact Type'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'ContactType',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Contact Type'),
+              'icon' => 'fa-plus',
+            ],
           ],
         ],
         'acl_bypass' => FALSE,

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php
index b5074525f6f905e019c2f7a815527117c9793947..6d784e714b74a0444d37bbd49aa6e0873395f9cd 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php
@@ -215,11 +215,16 @@ return [
               FALSE,
             ],
           ],
-          'addButton' => [
-            'path' => 'civicrm/admin/custom/group/field/add?reset=1&action=add&gid=[custom_group_id]',
-            'text' => E::ts('Add Custom Field'),
-            'icon' => 'fa-plus',
-            'autoOpen' => TRUE,
+          'toolbar' => [
+            [
+              'entity' => 'CustomField',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Custom Field'),
+              'icon' => 'fa-plus',
+              'autoOpen' => TRUE,
+            ],
           ],
           'placeholder' => 5,
         ],

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php
index 22d01e6709f212e2470a293770224a4b3d31e091..6fc669b84758362e9de2df05027faa6843e68ea9 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php
@@ -216,11 +216,16 @@ return [
             ],
           ],
           'placeholder' => 5,
-          'addButton' => [
-            'path' => 'civicrm/admin/custom/group/edit?reset=1',
-            'text' => E::ts('Add Set of Custom Fields'),
-            'icon' => 'fa-plus',
-            'autoOpen' => TRUE,
+          'toolbar' => [
+            [
+              'entity' => 'CustomGroup',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Set of Custom Fields'),
+              'icon' => 'fa-plus',
+              'autoOpen' => TRUE,
+            ],
           ],
         ],
         'acl_bypass' => FALSE,

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Accounts.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Accounts.mgd.php
index 87537a6719424adbbe5cf202d6c1ff89e646e4b3..037272055b0edb43e2df09f72e557e11768ace17 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Accounts.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Accounts.mgd.php
@@ -188,10 +188,15 @@ return [
               'alignment' => 'text-right',
             ],
           ],
-          'addButton' => [
-            'path' => 'civicrm/admin/financial/financialAccount/edit?action=add&reset=1',
-            'text' => E::ts('Add Financial Account'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'FinancialAccount',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Financial Account'),
+              'icon' => 'fa-plus',
+            ],
           ],
           'cssRules' => [
             [

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php
index 97b14eb98ee758a849f4f66bea166068a2f6b8dc..fb1c1f5149e09f6f552c661a314844da5428318f 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php
@@ -194,10 +194,15 @@ return [
               'alignment' => 'text-right',
             ],
           ],
-          'addButton' => [
-            'path' => 'civicrm/admin/financial/financialType/edit?reset=1&action=add',
-            'text' => E::ts('Add Financial Type'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'FinancialType',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Financial Type'),
+              'icon' => 'fa-plus',
+            ],
           ],
           'cssRules' => [
             [

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Location_Types.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Location_Types.mgd.php
index d0565012c83e8381a893af33e726b2f1078eb966..de21d6709c3dcd06308e9fc830dd1fed30aab676 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Location_Types.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Location_Types.mgd.php
@@ -172,10 +172,15 @@ return [
               'alignment' => 'text-right',
             ],
           ],
-          'addButton' => [
-            'path' => 'civicrm/admin/locationType/edit?action=add&reset=1',
-            'text' => E::ts('Add Location Type'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'LocationType',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Location Type'),
+              'icon' => 'fa-plus',
+            ],
           ],
           'cssRules' => [
             [

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Manage_Group.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Manage_Group.mgd.php
index 66fa0460c7e461655b8a1995e635d7b20324dac9..989a90f3ab1b2133b83d82e06067227059761f6d 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Manage_Group.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Manage_Group.mgd.php
@@ -273,10 +273,15 @@ return [
             'table',
             'table-striped',
           ],
-          'addButton' => [
-            'path' => 'civicrm/group/add?reset=1',
-            'text' => E::ts('Add Group'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'Group',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Group'),
+              'icon' => 'fa-plus',
+            ],
           ],
           'cssRules' => [
             [

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Payment_Processors.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Payment_Processors.mgd.php
index f6a9395febe9ea37ef725631324f0550149be816..5d77af6ea6b8c7e6ef0a7e9e51a68e565cc57beb 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Payment_Processors.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Payment_Processors.mgd.php
@@ -212,10 +212,15 @@ return [
               'alignment' => 'text-right',
             ],
           ],
-          'addButton' => [
-            'path' => 'civicrm/admin/paymentProcessor/edit?action=add&reset=1',
-            'text' => E::ts('Add Payment Processor'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'PaymentProcessor',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Payment Processor'),
+              'icon' => 'fa-plus',
+            ],
           ],
           'cssRules' => [
             [

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php
index bda07f5c26a884ebbd0b9cc5ef4544a8cb93ff6d..9e542201f1c4ea1d4784abff7a108e23dbc31c48 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php
@@ -191,11 +191,16 @@ return [
           ],
           'draggable' => 'weight',
           'button' => NULL,
-          'addButton' => [
-            'path' => 'civicrm/admin/uf/group/field/add?reset=1&action=add&gid=[uf_group_id]',
-            'text' => E::ts('Add Field'),
-            'icon' => 'fa-plus',
-            'autoOpen' => TRUE,
+          'toolbar' => [
+            [
+              'entity' => 'UFField',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Field'),
+              'icon' => 'fa-plus',
+              'autoOpen' => TRUE,
+            ],
           ],
           'cssRules' => [
             [

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php
index d0dc2982d684e752d9bc163042de1b36529abc2d..a856a52108d51b6a9b7fd38962c707f8015fb576 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php
@@ -262,10 +262,15 @@ return [
               'label' => '',
             ],
           ],
-          'addButton' => [
-            'path' => 'civicrm/admin/uf/group/add?action=add&reset=1',
-            'text' => E::ts('Add Profile'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'UFGroup',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Profile'),
+              'icon' => 'fa-plus',
+            ],
           ],
           'cssRules' => [
             [

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php
index 06e1764b09f6f65e1cc5b2d5b7b2893b9e462275..543637452e7cb2dff07d2445fdb0c88e8633d7c1 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php
@@ -163,10 +163,15 @@ return [
               'alignment' => 'text-right',
             ],
           ],
-          'addButton' => [
-            'path' => 'civicrm/admin/reltype/edit?action=add&reset=1',
-            'text' => E::ts('Add Relationship Type'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'RelationshipType',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Relationship Type'),
+              'icon' => 'fa-plus',
+            ],
           ],
           'cssRules' => [
             [

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Scheduled_Reminders.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Scheduled_Reminders.mgd.php
index e6e3387768c4d94969ef1968b4a91c840ae7c9b4..899c01af35c2d17fa94c11437c196cd0324399c0 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Scheduled_Reminders.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Scheduled_Reminders.mgd.php
@@ -187,10 +187,15 @@ return [
             'table-striped',
             'crm-sticky-header',
           ],
-          'addButton' => [
-            'path' => 'civicrm/admin/scheduleReminders/edit?reset=1&action=add',
-            'text' => E::ts('Add Scheduled Reminder'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'ActionSchedule',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Scheduled Reminder'),
+              'icon' => 'fa-plus',
+            ],
           ],
         ],
         'acl_bypass' => FALSE,

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Manage_ACLs.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Manage_ACLs.mgd.php
index 1138b1b1a68a5c4e881717f535a0bef530cb4643..22a541bf5b4b79919213bf48f31a07bc31d691cc 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Manage_ACLs.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Manage_ACLs.mgd.php
@@ -180,10 +180,15 @@ return [
             'table-striped',
             'crm-sticky-header',
           ],
-          'addButton' => [
-            'path' => 'civicrm/acl/edit?reset=1&action=add',
-            'text' => E::ts('Add ACL'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'ACL',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add ACL'),
+              'icon' => 'fa-plus',
+            ],
           ],
         ],
         'acl_bypass' => FALSE,

diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Mail_Accounts.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Mail_Accounts.mgd.php
index 3efe2e216d93504119734c2992feec0a1ecb509d..d1119fd2aaa5853c706cdce7556025d3398c27ad 100644 (file)
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Mail_Accounts.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Mail_Accounts.mgd.php
@@ -178,10 +178,15 @@ return [
             'table',
             'table-striped',
           ],
-          'addButton' => [
-            'path' => 'civicrm/admin/mailSettings/edit?action=add&reset=1',
-            'text' => E::ts('Add Mail Account'),
-            'icon' => 'fa-plus',
+          'toolbar' => [
+            [
+              'entity' => 'MailSettings',
+              'action' => 'add',
+              'target' => 'crm-popup',
+              'style' => 'primary',
+              'text' => E::ts('Add Mail Account'),
+              'icon' => 'fa-plus',
+            ],
           ],
         ],
         'acl_bypass' => FALSE,

diff --git a/xml/schema/Financial/EntityFinancialAccount.xml b/xml/schema/Financial/EntityFinancialAccount.xml
index 580fd8cd45cd3f8841b0464e214b0d55638e948f..8612e33f9cf8e55822f946a0d31356a1ca478b62 100644 (file)
--- a/xml/schema/Financial/EntityFinancialAccount.xml
+++ b/xml/schema/Financial/EntityFinancialAccount.xml
@@ -8,6 +8,11 @@
   <comment>Map between an entity and a financial account, where there is a specific relationship between the financial account and the entity, e.g. Income Account for or AR Account for</comment>
   <log>true</log>
   <component>CiviContribute</component>
+  <paths>
+    <add>civicrm/admin/financial/financialType/accounts?action=add&amp;reset=1&amp;aid=[entity_id]</add>
+    <update>civicrm/admin/financial/financialType/accounts?action=update&amp;id=[id]&amp;aid=[entity_id]&amp;reset=1</update>
+    <delete>civicrm/admin/financial/financialType/accounts?action=delete&amp;id=[id]&amp;aid=[entity_id]&amp;reset=1</delete>
+  </paths>
   <field>
     <name>id</name>
     <title>Entity Financial Account ID</title>