From e5a7dd177f4ae21912f14c97a394a17c6eaf041f Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 2 Sep 2014 13:29:31 +0100 Subject: [PATCH] CRM-15220 - Fix malformed url in grant menu --- CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl | 3 +++ xml/templates/civicrm_navigation.tpl | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl index efab89be71..f102e22f6c 100644 --- a/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl @@ -5,3 +5,6 @@ UPDATE `civicrm_dashboard` SET `permission` = 'access my cases and activities,ac -- CRM-15218 UPDATE `civicrm_uf_group` SET name = LOWER(name) WHERE name IN ("New_Individual", "New_Organization", "New_Household"); + +-- CRM-15220 +UPDATE `civicrm_navigation` SET url = 'civicrm/admin/options/grant_type?reset=1' WHERE url = 'civicrm/admin/options/grant_type&reset=1'; diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl index d3889e4032..4e542d4535 100644 --- a/xml/templates/civicrm_navigation.tpl +++ b/xml/templates/civicrm_navigation.tpl @@ -549,7 +549,7 @@ SET @adminGrantlastID:=LAST_INSERT_ID(); INSERT INTO civicrm_navigation ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) VALUES - ( @domainID, 'civicrm/admin/options/grant_type&reset=1', '{ts escape="sql" skip="true"}Grant Types{/ts}', 'Grant Types', 'access CiviGrant,administer CiviCRM', 'AND', @adminGrantlastID, '1', NULL, 1 ); + ( @domainID, 'civicrm/admin/options/grant_type?reset=1', '{ts escape="sql" skip="true"}Grant Types{/ts}', 'Grant Types', 'access CiviGrant,administer CiviCRM', 'AND', @adminGrantlastID, '1', NULL, 1 ); INSERT INTO civicrm_navigation ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) -- 2.25.1