From 5c385299652814045428c7f894165badd1e1ea67 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 3 Nov 2020 09:32:38 -0500 Subject: [PATCH] Use standard names from CRM_Core_Action for entity paths and add a few more paths For the sake of consistency, this changes the newly-added entity paths to follow the naming convention in CRM_Core_Action: add/update/view/delete instead of create/edit/view/delete --- CRM/Activity/DAO/Activity.php | 6 +++--- CRM/Campaign/DAO/Campaign.php | 13 ++++++++++++- CRM/Contact/DAO/Contact.php | 6 +++--- CRM/Contact/DAO/Group.php | 4 ++-- CRM/Contribute/DAO/Contribution.php | 6 +++--- CRM/Event/DAO/Event.php | 4 ++-- CRM/Grant/DAO/Grant.php | 6 +++--- CRM/Mailing/DAO/Mailing.php | 12 +++++++++++- CRM/Member/DAO/Membership.php | 6 +++--- ext/search/Civi/Search/Admin.php | 2 +- xml/schema/Activity/Activity.xml | 4 ++-- xml/schema/Campaign/Campaign.xml | 5 +++++ xml/schema/Contact/Contact.xml | 4 ++-- xml/schema/Contact/Group.xml | 2 +- xml/schema/Contribute/Contribution.xml | 4 ++-- xml/schema/Event/Event.xml | 2 +- xml/schema/Grant/Grant.xml | 4 ++-- xml/schema/Mailing/Mailing.xml | 4 ++++ xml/schema/Member/Membership.xml | 4 ++-- 19 files changed, 64 insertions(+), 34 deletions(-) diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php index a2d6b75763..39655685fd 100644 --- a/CRM/Activity/DAO/Activity.php +++ b/CRM/Activity/DAO/Activity.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Activity/Activity.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:3b397f370aac2ca9cc890b2476a4f9b2) + * (GenCodeChecksum:af42b47e95e8c7f47eb7a3ef53833383) */ /** @@ -43,9 +43,9 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { * @var string[] */ protected static $_paths = [ - 'create' => 'civicrm/activity?reset=1&action=add&context=standalone', + 'add' => 'civicrm/activity?reset=1&action=add&context=standalone', 'view' => 'civicrm/activity?reset=1&action=view&id=[id]', - 'edit' => 'civicrm/activity/add?reset=1&action=update&id=[id]', + 'update' => 'civicrm/activity/add?reset=1&action=update&id=[id]', 'delete' => 'civicrm/activity?reset=1&action=delete&id=[id]', ]; diff --git a/CRM/Campaign/DAO/Campaign.php b/CRM/Campaign/DAO/Campaign.php index 8dc0245910..89de98a9bb 100644 --- a/CRM/Campaign/DAO/Campaign.php +++ b/CRM/Campaign/DAO/Campaign.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Campaign/Campaign.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:a5a49e13e66a5d32b690835a49baf535) + * (GenCodeChecksum:1356a7073a6caa15e0da58422c6763b9) */ /** @@ -37,6 +37,17 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO { */ public static $_log = FALSE; + /** + * Paths for accessing this entity in the UI. + * + * @var string[] + */ + protected static $_paths = [ + 'add' => 'civicrm/campaign/add?reset=1', + 'update' => 'civicrm/campaign/add?reset=1&action=update&id=[id]', + 'delete' => 'civicrm/campaign/add?reset=1&action=delete&id=[id]', + ]; + /** * Unique Campaign ID. * diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php index 660a689823..30a35c82d0 100644 --- a/CRM/Contact/DAO/Contact.php +++ b/CRM/Contact/DAO/Contact.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/Contact.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:17f0dea71552c2f97ec38b3c2735cee7) + * (GenCodeChecksum:25d4fcd3814380d746574c9a17b51134) */ /** @@ -43,9 +43,9 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { * @var string[] */ protected static $_paths = [ - 'create' => 'civicrm/contact/add?reset=1&ct=[contact_type]', + 'add' => 'civicrm/contact/add?reset=1&ct=[contact_type]', 'view' => 'civicrm/contact/view?reset=1&cid=[id]', - 'edit' => 'civicrm/contact/add?reset=1&action=update&cid=[id]', + 'update' => 'civicrm/contact/add?reset=1&action=update&cid=[id]', 'delete' => 'civicrm/contact/view/delete?reset=1&delete=1&cid=[id]', ]; diff --git a/CRM/Contact/DAO/Group.php b/CRM/Contact/DAO/Group.php index f8d864745c..ff7e1c8beb 100644 --- a/CRM/Contact/DAO/Group.php +++ b/CRM/Contact/DAO/Group.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/Group.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:d336bd8016bae6726d40bc380e636a61) + * (GenCodeChecksum:49027c63bf6fd142e79220b39f84056d) */ /** @@ -43,7 +43,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO { * @var string[] */ protected static $_paths = [ - 'create' => 'civicrm/group/add?reset=1', + 'add' => 'civicrm/group/add?reset=1', ]; /** diff --git a/CRM/Contribute/DAO/Contribution.php b/CRM/Contribute/DAO/Contribution.php index 7b8ec0c68c..76c7adc133 100644 --- a/CRM/Contribute/DAO/Contribution.php +++ b/CRM/Contribute/DAO/Contribution.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/Contribution.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:a0c34048643bc4034239e4198386933f) + * (GenCodeChecksum:600b0cd019cba16cd62aae7463beab77) */ /** @@ -43,9 +43,9 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { * @var string[] */ protected static $_paths = [ - 'create' => 'civicrm/contribute/add?reset=1&action=add&context=standalone', + 'add' => 'civicrm/contribute/add?reset=1&action=add&context=standalone', 'view' => 'civicrm/contact/view/contribution?reset=1&action=view&id=[id]', - 'edit' => 'civicrm/contact/view/contribution?reset=1&action=update&id=[id]', + 'update' => 'civicrm/contact/view/contribution?reset=1&action=update&id=[id]', 'delete' => 'civicrm/contact/view/contribution?reset=1&action=delete&id=[id]', ]; diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php index a8f3af9f3a..a1e23959c0 100644 --- a/CRM/Event/DAO/Event.php +++ b/CRM/Event/DAO/Event.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Event/Event.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:797eb65ade6c6b5c48e904a389d8c3f2) + * (GenCodeChecksum:a7abbcbe6a0e5e49e55d61afd013c791) */ /** @@ -43,7 +43,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO { * @var string[] */ protected static $_paths = [ - 'create' => 'civicrm/event/add?reset=1', + 'add' => 'civicrm/event/add?reset=1', 'view' => 'civicrm/event/info?reset=1&id=[id]', ]; diff --git a/CRM/Grant/DAO/Grant.php b/CRM/Grant/DAO/Grant.php index d8ddafb0dd..4a37002606 100644 --- a/CRM/Grant/DAO/Grant.php +++ b/CRM/Grant/DAO/Grant.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Grant/Grant.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2eb30bbd797f8e26c00fa7d281e01807) + * (GenCodeChecksum:febf55259ea92f4dd6a7d1ee4b5ea93a) */ /** @@ -43,9 +43,9 @@ class CRM_Grant_DAO_Grant extends CRM_Core_DAO { * @var string[] */ protected static $_paths = [ - 'create' => 'civicrm/grant/add?reset=1&action=add&context=standalone', + 'add' => 'civicrm/grant/add?reset=1&action=add&context=standalone', 'view' => 'contact/view/grant?reset=1&action=view&id=[id]&cid=[contact_id]', - 'edit' => 'civicrm/contact/view/grant?reset=1&action=update&id=[id]&cid=[contact_id]', + 'update' => 'civicrm/contact/view/grant?reset=1&action=update&id=[id]&cid=[contact_id]', 'delete' => 'civicrm/contact/view/grant?reset=1&action=delete&id=[id]&cid=[contact_id]', ]; diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php index 95b4563035..392012f845 100644 --- a/CRM/Mailing/DAO/Mailing.php +++ b/CRM/Mailing/DAO/Mailing.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Mailing.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:9cd784dc86cf4f54983f14440be05239) + * (GenCodeChecksum:f1ac9d0a02ed59171d4efdc4209a376c) */ /** @@ -37,6 +37,16 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { */ public static $_log = FALSE; + /** + * Paths for accessing this entity in the UI. + * + * @var string[] + */ + protected static $_paths = [ + 'add' => 'civicrm/a/#/mailing/new', + 'update' => 'civicrm/a/#/mailing/[id]', + ]; + /** * @var int */ diff --git a/CRM/Member/DAO/Membership.php b/CRM/Member/DAO/Membership.php index 562314b98a..58610aef48 100644 --- a/CRM/Member/DAO/Membership.php +++ b/CRM/Member/DAO/Membership.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Member/Membership.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:38f4702a01712d300c1e87cb81ed6555) + * (GenCodeChecksum:2f2fd321dc15b2e2f453fc600d994c9a) */ /** @@ -43,9 +43,9 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { * @var string[] */ protected static $_paths = [ - 'create' => 'civicrm/member/add?reset=1&action=add&context=standalone', + 'add' => 'civicrm/member/add?reset=1&action=add&context=standalone', 'view' => 'civicrm/contact/view/membership?reset=1&action=view&id=[id]&cid=[contact_id]', - 'edit' => 'civicrm/contact/view/membership?reset=1&action=update&id=[id]&cid=[contact_id]', + 'update' => 'civicrm/contact/view/membership?reset=1&action=update&id=[id]&cid=[contact_id]', 'delete' => 'civicrm/contact/view/membership?reset=1&action=delete&id=[id]&cid=[contact_id]', ]; diff --git a/ext/search/Civi/Search/Admin.php b/ext/search/Civi/Search/Admin.php index fab5cd7870..bf392c57b0 100644 --- a/ext/search/Civi/Search/Admin.php +++ b/ext/search/Civi/Search/Admin.php @@ -76,7 +76,7 @@ class Admin { $title = ts('View %1', [1 => $entity['title']]); break; - case 'edit': + case 'update': $title = ts('Edit %1', [1 => $entity['title']]); break; diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml index 946b7709be..2a1dde72ea 100644 --- a/xml/schema/Activity/Activity.xml +++ b/xml/schema/Activity/Activity.xml @@ -8,9 +8,9 @@ true fa-tasks - civicrm/activity?reset=1&action=add&context=standalone + civicrm/activity?reset=1&action=add&context=standalone civicrm/activity?reset=1&action=view&id=[id] - civicrm/activity/add?reset=1&action=update&id=[id] + civicrm/activity/add?reset=1&action=update&id=[id] civicrm/activity?reset=1&action=delete&id=[id] diff --git a/xml/schema/Campaign/Campaign.xml b/xml/schema/Campaign/Campaign.xml index c87c03730d..3625aca74a 100644 --- a/xml/schema/Campaign/Campaign.xml +++ b/xml/schema/Campaign/Campaign.xml @@ -6,6 +6,11 @@ Campaign Details. 3.3 fa-bullhorn + + civicrm/campaign/add?reset=1 + civicrm/campaign/add?reset=1&action=update&id=[id] + civicrm/campaign/add?reset=1&action=delete&id=[id] + id Campaign ID diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml index b99c1f23fd..6002cc6f46 100644 --- a/xml/schema/Contact/Contact.xml +++ b/xml/schema/Contact/Contact.xml @@ -9,9 +9,9 @@ true fa-address-book-o - civicrm/contact/add?reset=1&ct=[contact_type] + civicrm/contact/add?reset=1&ct=[contact_type] civicrm/contact/view?reset=1&cid=[id] - civicrm/contact/add?reset=1&action=update&cid=[id] + civicrm/contact/add?reset=1&action=update&cid=[id] civicrm/contact/view/delete?reset=1&delete=1&cid=[id] diff --git a/xml/schema/Contact/Group.xml b/xml/schema/Contact/Group.xml index 574fc452e6..4121891f93 100644 --- a/xml/schema/Contact/Group.xml +++ b/xml/schema/Contact/Group.xml @@ -9,7 +9,7 @@ true fa-users - civicrm/group/add?reset=1 + civicrm/group/add?reset=1 id diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml index 10c1b6c241..8d7635d51c 100644 --- a/xml/schema/Contribute/Contribution.xml +++ b/xml/schema/Contribute/Contribution.xml @@ -8,9 +8,9 @@ true fa-credit-card - civicrm/contribute/add?reset=1&action=add&context=standalone + civicrm/contribute/add?reset=1&action=add&context=standalone civicrm/contact/view/contribution?reset=1&action=view&id=[id] - civicrm/contact/view/contribution?reset=1&action=update&id=[id] + civicrm/contact/view/contribution?reset=1&action=update&id=[id] civicrm/contact/view/contribution?reset=1&action=delete&id=[id] diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml index d1ead83b35..7471a61e8a 100644 --- a/xml/schema/Event/Event.xml +++ b/xml/schema/Event/Event.xml @@ -8,7 +8,7 @@ true fa-calendar - civicrm/event/add?reset=1 + civicrm/event/add?reset=1 civicrm/event/info?reset=1&id=[id] diff --git a/xml/schema/Grant/Grant.xml b/xml/schema/Grant/Grant.xml index 387efe6a00..da03aea06f 100644 --- a/xml/schema/Grant/Grant.xml +++ b/xml/schema/Grant/Grant.xml @@ -8,9 +8,9 @@ true fa-money - civicrm/grant/add?reset=1&action=add&context=standalone + civicrm/grant/add?reset=1&action=add&context=standalone contact/view/grant?reset=1&action=view&id=[id]&cid=[contact_id] - civicrm/contact/view/grant?reset=1&action=update&id=[id]&cid=[contact_id] + civicrm/contact/view/grant?reset=1&action=update&id=[id]&cid=[contact_id] civicrm/contact/view/grant?reset=1&action=delete&id=[id]&cid=[contact_id] diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml index 389b30be96..5fc2a62b20 100644 --- a/xml/schema/Mailing/Mailing.xml +++ b/xml/schema/Mailing/Mailing.xml @@ -7,6 +7,10 @@ Stores information about a mailing. true fa-envelope-o + + civicrm/a/#/mailing/new + civicrm/a/#/mailing/[id] + id Mailing ID diff --git a/xml/schema/Member/Membership.xml b/xml/schema/Member/Membership.xml index 760c2493e5..b2063cb4ad 100644 --- a/xml/schema/Member/Membership.xml +++ b/xml/schema/Member/Membership.xml @@ -9,9 +9,9 @@ true fa-id-badge - civicrm/member/add?reset=1&action=add&context=standalone + civicrm/member/add?reset=1&action=add&context=standalone civicrm/contact/view/membership?reset=1&action=view&id=[id]&cid=[contact_id] - civicrm/contact/view/membership?reset=1&action=update&id=[id]&cid=[contact_id] + civicrm/contact/view/membership?reset=1&action=update&id=[id]&cid=[contact_id] civicrm/contact/view/membership?reset=1&action=delete&id=[id]&cid=[contact_id] -- 2.25.1