From: Coleman Watts Date: Tue, 2 Sep 2014 12:52:09 +0000 (+0100) Subject: CRM-15220 - Add status options to grant menu X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cdf071847db0ea7970ec3078ae914d53466f174a;p=civicrm-core.git CRM-15220 - Add status options to grant menu --- diff --git a/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl index f102e22f6c..d67a677af1 100644 --- a/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl @@ -8,3 +8,9 @@ UPDATE `civicrm_uf_group` SET name = LOWER(name) WHERE name IN ("New_Individual" -- CRM-15220 UPDATE `civicrm_navigation` SET url = 'civicrm/admin/options/grant_type?reset=1' WHERE url = 'civicrm/admin/options/grant_type&reset=1'; + +SELECT @parent_id := `id` FROM `civicrm_navigation` WHERE `name` = 'CiviGrant' AND `domain_id` = {$domainID}; +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_status?reset=1', '{ts escape="sql" skip="true"}Grant Status{/ts}', 'Grant Status', 'access CiviGrant,administer CiviCRM', 'AND', @parent_id, '1', NULL, 2 ); diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl index 4e542d4535..490f4ebcd1 100644 --- a/xml/templates/civicrm_navigation.tpl +++ b/xml/templates/civicrm_navigation.tpl @@ -549,7 +549,8 @@ 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 ), + ( @domainID, 'civicrm/admin/options/grant_status?reset=1', '{ts escape="sql" skip="true"}Grant Status{/ts}', 'Grant Status', 'access CiviGrant,administer CiviCRM', 'AND', @adminGrantlastID, '1', NULL, 2 ); INSERT INTO civicrm_navigation ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )