From: Aidan Saunders Date: Tue, 25 Jul 2023 16:12:25 +0000 (+0100) Subject: Add /edit paths for Price Sets, Price Fields and Price Field Values X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7060598774f023cdc4e7469dcf69918c3b534dcc;p=civicrm-core.git Add /edit paths for Price Sets, Price Fields and Price Field Values --- diff --git a/CRM/Core/xml/Menu/Admin.xml b/CRM/Core/xml/Menu/Admin.xml index 2b23a6ecab..6eb998424a 100644 --- a/CRM/Core/xml/Menu/Admin.xml +++ b/CRM/Core/xml/Menu/Admin.xml @@ -678,17 +678,33 @@ access CiviCRM,access CiviEvent action=add + + civicrm/admin/price/edit + Price Sets + CRM_Price_Page_Set + access CiviCRM,access CiviEvent + civicrm/admin/price/field Price Fields CRM_Price_Page_Field true + + civicrm/admin/price/field/edit + Price Fields + CRM_Price_Page_Field + civicrm/admin/price/field/option Price Field Options CRM_Price_Page_Option + + civicrm/admin/price/field/option/edit + Price Field Options + CRM_Price_Page_Option + civicrm/ajax/mapping CRM_Admin_Page_AJAX::mappingList diff --git a/CRM/Price/Form/Field.php b/CRM/Price/Form/Field.php index ad39c0dece..3f2b2bd6a7 100644 --- a/CRM/Price/Form/Field.php +++ b/CRM/Price/Form/Field.php @@ -653,7 +653,7 @@ class CRM_Price_Form_Field extends CRM_Core_Form { $session = CRM_Core_Session::singleton(); if ($buttonName == $this->getButtonName('next', 'new')) { CRM_Core_Session::setStatus(ts(' You can add another price set field.'), '', 'info'); - $session->replaceUserContext(CRM_Utils_System::url('civicrm/admin/price/field', 'reset=1&action=add&sid=' . $this->_sid)); + $session->replaceUserContext(CRM_Utils_System::url('civicrm/admin/price/field/edit', 'reset=1&action=add&sid=' . $this->_sid)); } else { $session->replaceUserContext(CRM_Utils_System::url('civicrm/admin/price/field', 'reset=1&action=browse&sid=' . $this->_sid)); diff --git a/CRM/Price/Form/Set.php b/CRM/Price/Form/Set.php index 9bf062edb5..5abbc00ca0 100644 --- a/CRM/Price/Form/Set.php +++ b/CRM/Price/Form/Set.php @@ -272,7 +272,7 @@ class CRM_Price_Form_Set extends CRM_Core_Form { else { // Jump directly to adding a field if popups are disabled $action = CRM_Core_Resources::singleton()->ajaxPopupsEnabled ? 'browse' : 'add'; - $url = CRM_Utils_System::url('civicrm/admin/price/field', [ + $url = CRM_Utils_System::url('civicrm/admin/price/field/edit', [ 'reset' => 1, 'action' => $action, 'sid' => $set->id, diff --git a/CRM/Price/Page/Field.php b/CRM/Price/Page/Field.php index bfa6feab97..b519c129d6 100644 --- a/CRM/Price/Page/Field.php +++ b/CRM/Price/Page/Field.php @@ -59,13 +59,13 @@ class CRM_Price_Page_Field extends CRM_Core_Page { self::$_actionLinks = [ CRM_Core_Action::UPDATE => [ 'name' => ts('Edit Price Field'), - 'url' => 'civicrm/admin/price/field', + 'url' => 'civicrm/admin/price/field/edit', 'qs' => 'action=update&reset=1&sid=%%sid%%&fid=%%fid%%', 'title' => ts('Edit Price'), ], CRM_Core_Action::PREVIEW => [ 'name' => ts('Preview Field'), - 'url' => 'civicrm/admin/price/field', + 'url' => 'civicrm/admin/price/field/edit', 'qs' => 'action=preview&reset=1&sid=%%sid%%&fid=%%fid%%', 'title' => ts('Preview Price'), ], @@ -81,7 +81,7 @@ class CRM_Price_Page_Field extends CRM_Core_Page { ], CRM_Core_Action::DELETE => [ 'name' => ts('Delete'), - 'url' => 'civicrm/admin/price/field', + 'url' => 'civicrm/admin/price/field/edit', 'qs' => 'action=delete&reset=1&sid=%%sid%%&fid=%%fid%%', 'title' => ts('Delete Price'), ], diff --git a/CRM/Price/Page/Option.php b/CRM/Price/Page/Option.php index 3a999008f5..ee633afe64 100644 --- a/CRM/Price/Page/Option.php +++ b/CRM/Price/Page/Option.php @@ -68,13 +68,13 @@ class CRM_Price_Page_Option extends CRM_Core_Page { self::$_actionLinks = [ CRM_Core_Action::UPDATE => [ 'name' => ts('Edit Option'), - 'url' => 'civicrm/admin/price/field/option', + 'url' => 'civicrm/admin/price/field/option/edit', 'qs' => 'reset=1&action=update&oid=%%oid%%&fid=%%fid%%&sid=%%sid%%', 'title' => ts('Edit Price Option'), ], CRM_Core_Action::VIEW => [ 'name' => ts('View'), - 'url' => 'civicrm/admin/price/field/option', + 'url' => 'civicrm/admin/price/field/option/edit', 'qs' => 'action=view&oid=%%oid%%', 'title' => ts('View Price Option'), ], @@ -90,7 +90,7 @@ class CRM_Price_Page_Option extends CRM_Core_Page { ], CRM_Core_Action::DELETE => [ 'name' => ts('Delete'), - 'url' => 'civicrm/admin/price/field/option', + 'url' => 'civicrm/admin/price/field/option/edit', 'qs' => 'action=delete&oid=%%oid%%', 'title' => ts('Disable Price Option'), ], diff --git a/CRM/Price/Page/Set.php b/CRM/Price/Page/Set.php index c88e4a8d40..039952f44b 100644 --- a/CRM/Price/Page/Set.php +++ b/CRM/Price/Page/Set.php @@ -53,13 +53,13 @@ class CRM_Price_Page_Set extends CRM_Core_Page { ], CRM_Core_Action::PREVIEW => [ 'name' => ts('Preview'), - 'url' => 'civicrm/admin/price', + 'url' => 'civicrm/admin/price/edit', 'qs' => 'action=preview&reset=1&sid=%%sid%%', 'title' => ts('Preview Price Set'), ], CRM_Core_Action::UPDATE => [ 'name' => ts('Settings'), - 'url' => 'civicrm/admin/price', + 'url' => 'civicrm/admin/price/edit', 'qs' => 'action=update&reset=1&sid=%%sid%%', 'title' => ts('Edit Price Set'), ], @@ -75,7 +75,7 @@ class CRM_Price_Page_Set extends CRM_Core_Page { ], CRM_Core_Action::DELETE => [ 'name' => ts('Delete'), - 'url' => 'civicrm/admin/price', + 'url' => 'civicrm/admin/price/edit', 'qs' => 'action=delete&reset=1&sid=%%sid%%', 'title' => ts('Delete Price Set'), 'extra' => 'onclick = "return confirm(\'' . $deleteExtra . '\');"', diff --git a/templates/CRM/Price/Page/Field.tpl b/templates/CRM/Price/Page/Field.tpl index fb1b16ae29..e4284ca2b0 100644 --- a/templates/CRM/Price/Page/Field.tpl +++ b/templates/CRM/Price/Page/Field.tpl @@ -74,9 +74,9 @@
{if !$isReserved} - {crmButton q="reset=1&action=add&sid=$sid" id="newPriceField" icon="plus-circle"}{ts}Add Price Field{/ts}{/crmButton} + {crmButton p="civicrm/admin/price/edit" q="reset=1&action=add&sid=$sid" id="newPriceField" icon="plus-circle"}{ts}Add Price Field{/ts}{/crmButton} {/if} - {crmButton p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field" icon="television"}{ts}Preview (all fields){/ts}{/crmButton} + {crmButton p="civicrm/admin/price/edit" q="action=preview&sid=`$sid`&reset=1&context=field" icon="television"}{ts}Preview (all fields){/ts}{/crmButton}
{else} @@ -86,7 +86,7 @@ {ts}None found.{/ts}
- {crmButton q="reset=1&action=add&sid=$sid" id="newPriceField" icon="plus-circle"}{ts}Add Price Field{/ts}{/crmButton} + {crmButton p="civicrm/admin/price/edit" q="reset=1&action=add&sid=$sid" id="newPriceField" icon="plus-circle"}{ts}Add Price Field{/ts}{/crmButton}
{/if} {/if} diff --git a/templates/CRM/Price/Page/Option.tpl b/templates/CRM/Price/Page/Option.tpl index dd04c1dda3..6737dcea95 100644 --- a/templates/CRM/Price/Page/Option.tpl +++ b/templates/CRM/Price/Page/Option.tpl @@ -97,8 +97,8 @@ {/if} {if $addMoreFields && !$isReserved}
- {crmButton q="reset=1&action=add&fid=$fid&sid=$sid" icon="plus-circle"}{ts 1=$fieldTitle}New Option for '%1'{/ts}{/crmButton} - {crmButton p="civicrm/admin/price/field" q="reset=1&sid=$sid" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton} + {crmButton p="civicrm/admin/price/field/edit" q="reset=1&action=add&fid=$fid&sid=$sid" icon="plus-circle"}{ts 1=$fieldTitle}New Option for '%1'{/ts}{/crmButton} + {crmButton p="civicrm/admin/price/field/edit" q="reset=1&sid=$sid" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
{/if} {/if} diff --git a/templates/CRM/Price/Page/Set.tpl b/templates/CRM/Price/Page/Set.tpl index 4e4e9e5b96..15accf0acb 100644 --- a/templates/CRM/Price/Page/Set.tpl +++ b/templates/CRM/Price/Page/Set.tpl @@ -57,7 +57,7 @@ {if NOT ($action eq 1 or $action eq 2) }
- {crmButton p='civicrm/admin/price' q="action=add&reset=1" id="newPriceSet" icon="plus-circle"}{ts}Add Set of Price Fields{/ts}{/crmButton} + {crmButton p='civicrm/admin/price/edit' q="action=add&reset=1" id="newPriceSet" icon="plus-circle"}{ts}Add Set of Price Fields{/ts}{/crmButton}
{/if} @@ -67,7 +67,7 @@ {if $action ne 1} {* When we are adding an item, we should not display this message *} {capture assign=infoTitle}{ts}No price sets have been added yet.{/ts}{/capture} {assign var="infoType" value="no-popup"} - {capture assign=crmURL}{crmURL p='civicrm/admin/price' q='action=add&reset=1'}{/capture} + {capture assign=crmURL}{crmURL p='civicrm/admin/price/edit' q='action=add&reset=1'}{/capture} {capture assign=infoMessage}{ts 1=$crmURL}You can create one here.{/ts}{/capture} {include file="CRM/common/info.tpl"} {/if} diff --git a/tests/phpunit/CRM/Core/FormTest.php b/tests/phpunit/CRM/Core/FormTest.php index ddae834236..fe79745b04 100644 --- a/tests/phpunit/CRM/Core/FormTest.php +++ b/tests/phpunit/CRM/Core/FormTest.php @@ -91,8 +91,8 @@ class CRM_Core_FormTest extends CiviUnitTestCase { 'title' => 'Priciest Price Set', ])['id']; - $_SERVER['REQUEST_URI'] = "civicrm/admin/price/field?reset=1&action=add&sid={$priceSetId}"; - $_GET['q'] = 'civicrm/admin/price/field'; + $_SERVER['REQUEST_URI'] = "civicrm/admin/price/field/edit?reset=1&action=add&sid={$priceSetId}"; + $_GET['q'] = 'civicrm/admin/price/field/edit'; $_REQUEST['reset'] = 1; $_REQUEST['action'] = 'add'; $_REQUEST['sid'] = $priceSetId; diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl index a1b3807525..b628524d61 100644 --- a/xml/templates/civicrm_navigation.tpl +++ b/xml/templates/civicrm_navigation.tpl @@ -133,7 +133,7 @@ VALUES ( @domainID, 'civicrm/admin/contribute?reset=1', '{ts escape="sql" skip="true"}Manage Contribution Pages{/ts}', 'Manage Contribution Pages', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', '1', 10 ), ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=contribute', '{ts escape="sql" skip="true"}Personal Campaign Pages{/ts}', 'Personal Campaign Pages', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', NULL, 11 ), ( @domainID, 'civicrm/admin/contribute/managePremiums?reset=1', '{ts escape="sql" skip="true"}Premiums (Thank-you Gifts){/ts}', 'Premiums', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', 1, 12 ), - ( @domainID, 'civicrm/admin/price?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '0', NULL, 13 ), + ( @domainID, 'civicrm/admin/price/edit?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '0', NULL, 13 ), ( @domainID, 'civicrm/admin/price?reset=1', '{ts escape="sql" skip="true"}Manage Price Sets{/ts}', 'Manage Price Sets', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', 1, 14 ), ( @domainID, 'civicrm/financial/batch?reset=1&action=add', '{ts escape="sql" skip="true"}New Batch{/ts}', 'New Batch', 'create manual batch', 'AND', @financialTransactionID, '1', NULL, 1 ), @@ -159,7 +159,7 @@ VALUES ( @domainID, 'civicrm/event/manage?reset=1', '{ts escape="sql" skip="true"}Manage Events{/ts}', 'Manage Events', 'access CiviEvent,edit all events', 'AND', @eventlastID, '1', 1, 7 ), ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=event', '{ts escape="sql" skip="true"}Personal Campaign Pages{/ts}', 'Personal Campaign Pages', 'access CiviEvent,administer CiviCRM', 'AND', @eventlastID, '1', 1, 8 ), ( @domainID, 'civicrm/admin/eventTemplate?reset=1', '{ts escape="sql" skip="true"}Event Templates{/ts}', 'Event Templates', 'access CiviEvent,edit all events', 'AND', @eventlastID, '1', 1, 9 ), - ( @domainID, 'civicrm/admin/price?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviEvent,edit all events', 'AND', @eventlastID, '0', NULL, 10 ), + ( @domainID, 'civicrm/admin/price/edit?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviEvent,edit all events', 'AND', @eventlastID, '0', NULL, 10 ), ( @domainID, 'civicrm/admin/price?reset=1', '{ts escape="sql" skip="true"}Manage Price Sets{/ts}', 'Manage Price Sets', 'access CiviEvent,edit all events', 'AND', @eventlastID, '1', NULL, 11 ); INSERT INTO civicrm_navigation @@ -199,7 +199,7 @@ VALUES ( @domainID, 'civicrm/report/list?compid=3&reset=1', '{ts escape="sql" skip="true"}Membership Reports{/ts}', 'Membership Reports', 'access CiviMember', '', @memberlastID, '1', 1, 4 ), ( @domainID, 'civicrm/batch?reset=1', '{ts escape="sql" skip="true"}Batch Data Entry{/ts}', 'Batch Data Entry','access CiviContribute', '', @memberlastID, '1', NULL, 5 ), ( @domainID, 'civicrm/member/import?reset=1', '{ts escape="sql" skip="true"}Import Memberships{/ts}', 'Import Members', 'access CiviMember,edit memberships', 'AND', @memberlastID, '1', 1, 6 ), - ( @domainID, 'civicrm/admin/price?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviMember,administer CiviCRM', 'AND', @memberlastID, '0', NULL, 7 ), + ( @domainID, 'civicrm/admin/price/edit?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviMember,administer CiviCRM', 'AND', @memberlastID, '0', NULL, 7 ), ( @domainID, 'civicrm/admin/price?reset=1', '{ts escape="sql" skip="true"}Manage Price Sets{/ts}', 'Manage Price Sets', 'access CiviMember,administer CiviCRM', 'AND', @memberlastID, '1', NULL, 8 ); INSERT INTO civicrm_navigation @@ -426,7 +426,7 @@ VALUES ( @domainID, 'civicrm/admin/options/payment_instrument?reset=1', '{ts escape="sql" skip="true"}Payment Methods{/ts}', 'Payment Instruments', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 12 ), ( @domainID, 'civicrm/admin/options/accept_creditcard?reset=1', '{ts escape="sql" skip="true"}Accepted Credit Cards{/ts}', 'Accepted Credit Cards', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 13 ), ( @domainID, 'civicrm/admin/options/soft_credit_type?reset=1', '{ts escape="sql" skip="true"}Soft Credit Types{/ts}', 'Soft Credit Types', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', 1, 14 ), - ( @domainID, 'civicrm/admin/price?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '0', NULL, 15 ), + ( @domainID, 'civicrm/admin/price/edit?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '0', NULL, 15 ), ( @domainID, 'civicrm/admin/price?reset=1', '{ts escape="sql" skip="true"}Manage Price Sets{/ts}', 'Manage Price Sets', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 16 ), ( @domainID, 'civicrm/admin/paymentProcessor?reset=1', '{ts escape="sql" skip="true"}Payment Processors{/ts}', 'Payment Processors', 'administer CiviCRM', '', @adminContributelastID, '1', NULL, 17 ), ( @domainID, 'civicrm/admin/setting/preferences/contribute?reset=1', '{ts escape="sql" skip="true"}CiviContribute Component Settings{/ts}', 'CiviContribute Component Settings', 'administer CiviCRM', '', @adminContributelastID, '1', NULL, 18 ) ; @@ -444,7 +444,7 @@ VALUES ( @domainID, 'civicrm/event/manage?reset=1', '{ts escape="sql" skip="true"}Manage Events{/ts}', 'Manage Events', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', 1, 2 ), ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=event', '{ts escape="sql" skip="true"}Personal Campaign Pages{/ts}', 'Personal Campaign Pages', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', 1, 3 ), ( @domainID, 'civicrm/admin/eventTemplate?reset=1', '{ts escape="sql" skip="true"}Event Templates{/ts}', 'Event Templates', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', 1, 4 ), - ( @domainID, 'civicrm/admin/price?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '0', NULL, 5 ), + ( @domainID, 'civicrm/admin/price/edit?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '0', NULL, 5 ), ( @domainID, 'civicrm/admin/price?reset=1', '{ts escape="sql" skip="true"}Manage Price Sets{/ts}', 'Manage Price Sets', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', 1, 6 ), ( @domainID, 'civicrm/admin/options/event_type?reset=1', '{ts escape="sql" skip="true"}Event Types{/ts}', 'Event Types', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 7 ), ( @domainID, 'civicrm/admin/participant_status?reset=1', '{ts escape="sql" skip="true"}Participant Statuses{/ts}', 'Participant Statuses', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 8 ), @@ -481,7 +481,7 @@ INSERT INTO civicrm_navigation VALUES ( @domainID, 'civicrm/admin/member/membershipType?reset=1', '{ts escape="sql" skip="true"}Membership Types{/ts}', 'Membership Types', 'access CiviMember,administer CiviCRM', 'AND', @adminMemberlastID, '1', NULL, 1 ), ( @domainID, 'civicrm/admin/member/membershipStatus?reset=1', '{ts escape="sql" skip="true"}Membership Status Rules{/ts}', 'Membership Status Rules', 'access CiviMember,administer CiviCRM', 'AND', @adminMemberlastID, '1', 1, 2 ), - ( @domainID, 'civicrm/admin/price?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviMember,administer CiviCRM', 'AND', @adminMemberlastID, '1', NULL, 3 ), + ( @domainID, 'civicrm/admin/price/edit?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviMember,administer CiviCRM', 'AND', @adminMemberlastID, '1', NULL, 3 ), ( @domainID, 'civicrm/admin/price?reset=1', '{ts escape="sql" skip="true"}Manage Price Sets{/ts}', 'Manage Price Sets', 'access CiviMember,administer CiviCRM', 'AND', @adminMemberlastID, '1', NULL, 4 ), ( @domainID, 'civicrm/admin/setting/preferences/member?reset=1', '{ts escape="sql" skip="true"}CiviMember Component Settings{/ts}', 'CiviMember Component Settings','access CiviMember,administer CiviCRM', 'AND', @adminMemberlastID, '1', NULL, 5 );