From: Aidan Saunders <aidan.saunders@squiffle.uk>
Date: Thu, 16 Nov 2023 21:46:41 +0000 (+0000)
Subject: Move civicrm/contribute/manage to civicrm/admin/contribute/manage
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=44391a6ed149127de4c683925eb46217ed4e2289;p=civicrm-core.git

Move civicrm/contribute/manage to civicrm/admin/contribute/manage
Update one reference to old path
Change Contribution Page clone and delete to use new path
---

diff --git a/CRM/Contribute/DAO/ContributionPage.php b/CRM/Contribute/DAO/ContributionPage.php
index 7ce4c8cc85..788b6b26f3 100644
--- a/CRM/Contribute/DAO/ContributionPage.php
+++ b/CRM/Contribute/DAO/ContributionPage.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionPage.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:84e81e764d43c0d0116ae54d90a18a84)
+ * (GenCodeChecksum:8c1f3262364d5a5f1255e1f0eb4bf690)
  */
 
 /**
@@ -46,7 +46,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   protected static $_paths = [
     'add' => 'civicrm/admin/contribute/add?reset=1&action=add',
     'update' => 'civicrm/admin/contribute/settings?reset=1&action=update&id=[id]',
-    'delete' => 'civicrm/admin/contribute?reset=1&action=delete&id=[id]',
+    'delete' => 'civicrm/admin/contribute/manage?reset=1&action=delete&id=[id]',
     'browse' => 'civicrm/admin/contribute',
   ];
 
diff --git a/CRM/Contribute/xml/Menu/Contribute.xml b/CRM/Contribute/xml/Menu/Contribute.xml
index 77b12723e4..1757c746a6 100644
--- a/CRM/Contribute/xml/Menu/Contribute.xml
+++ b/CRM/Contribute/xml/Menu/Contribute.xml
@@ -201,7 +201,7 @@
     <weight>588</weight>
   </item>
   <item>
-    <path>civicrm/contribute/manage</path>
+    <path>civicrm/admin/contribute/manage</path>
     <title>Manage Contribution Pages</title>
     <page_callback>CRM_Contribute_Page_ContributionPage</page_callback>
     <access_arguments>administer CiviCRM,access CiviContribute</access_arguments>
diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php
index d263bece39..c2504145a9 100644
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php
@@ -200,7 +200,7 @@ return [
                   'condition' => [],
                 ],
                 [
-                  'path' => 'civicrm/admin/contribute?action=copy&gid=[id]',
+                  'path' => 'civicrm/admin/contribute/manage?action=copy&gid=[id]',
                   'icon' => 'fa-clone',
                   'text' => E::ts('Clone'),
                   'style' => 'secondary',
@@ -230,7 +230,7 @@ return [
                 ],
                 [
                   'entity' => 'ContributionPage',
-                  'action' => 'delete',
+                  'action' => '',
                   'join' => '',
                   'target' => 'crm-popup',
                   'icon' => 'fa-trash',
@@ -238,6 +238,7 @@ return [
                   'style' => 'danger',
                   'path' => '',
                   'condition' => [],
+                  'task' => 'delete',
                 ],
               ],
               'type' => 'buttons',
diff --git a/templates/CRM/Contribute/Page/ContributionPage.tpl b/templates/CRM/Contribute/Page/ContributionPage.tpl
index f3fd1af036..1a2b77367c 100644
--- a/templates/CRM/Contribute/Page/ContributionPage.tpl
+++ b/templates/CRM/Contribute/Page/ContributionPage.tpl
@@ -88,7 +88,7 @@
   {if $isSearch eq 1}
       <div class="status messages">
                 <img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}"/>
-                {capture assign=browseURL}{crmURL p='civicrm/contribute/manage' q="reset=1"}{/capture}
+                {capture assign=browseURL}{crmURL p='civicrm/admin/contribute/manage' q="reset=1"}{/capture}
                     {ts}No available Contribution Pages match your search criteria. Suggestions:{/ts}
                     <div class="spacer"></div>
                     <ul>
diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml
index c0e030b048..92feacda65 100644
--- a/xml/schema/Contribute/ContributionPage.xml
+++ b/xml/schema/Contribute/ContributionPage.xml
@@ -12,7 +12,7 @@
   <paths>
     <add>civicrm/admin/contribute/add?reset=1&amp;action=add</add>
     <update>civicrm/admin/contribute/settings?reset=1&amp;action=update&amp;id=[id]</update>
-    <delete>civicrm/admin/contribute?reset=1&amp;action=delete&amp;id=[id]</delete>
+    <delete>civicrm/admin/contribute/manage?reset=1&amp;action=delete&amp;id=[id]</delete>
     <browse>civicrm/admin/contribute</browse>
   </paths>
   <field>