From 90d13f7e30e64f84f85c2c56e1acc561978c77d6 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Mon, 16 Jun 2014 16:22:12 -0700
Subject: [PATCH] CRM-14852 - add access CiviCRM to access argument to various
 paths.

----------------------------------------
* CRM-14852:
  https://issues.civicrm.org/jira/browse/CRM-14852
---
 CRM/Core/xml/Menu/Admin.xml      | 4 ++--
 CRM/Event/xml/Menu/Event.xml     | 4 ++--
 CRM/Mailing/xml/Menu/Mailing.xml | 8 ++++----
 CRM/Report/xml/Menu/Report.xml   | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CRM/Core/xml/Menu/Admin.xml b/CRM/Core/xml/Menu/Admin.xml
index 8877a7d030..9fe6cb2836 100644
--- a/CRM/Core/xml/Menu/Admin.xml
+++ b/CRM/Core/xml/Menu/Admin.xml
@@ -666,7 +666,7 @@
      <title>Price Sets</title>
      <page_callback>CRM_Price_Page_Set</page_callback>
      <desc>Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.</desc>
-     <access_arguments>administer CiviCRM;access CiviEvent</access_arguments>
+     <access_arguments>access CiviCRM,access CiviEvent</access_arguments>
      <adminGroup>Customize</adminGroup>
      <icon>admin/small/price_sets.png</icon>
      <weight>380</weight>
@@ -676,7 +676,7 @@
      <title>New Price Set</title>
      <page_callback>CRM_Price_Page_Set</page_callback>
      <desc>Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.</desc>
-     <access_arguments>administer CiviCRM;access CiviEvent</access_arguments>
+     <access_arguments>access CiviCRM,access CiviEvent</access_arguments>
      <path_arguments>action=add</path_arguments>
   </item>
   <item>
diff --git a/CRM/Event/xml/Menu/Event.xml b/CRM/Event/xml/Menu/Event.xml
index eedf0d2df6..9222b5a921 100644
--- a/CRM/Event/xml/Menu/Event.xml
+++ b/CRM/Event/xml/Menu/Event.xml
@@ -5,7 +5,7 @@
      <path>civicrm/event</path>
      <title>CiviEvent Dashboard</title>
      <page_callback>CRM_Event_Page_DashBoard</page_callback>
-     <access_arguments>access CiviEvent</access_arguments>
+     <access_arguments>access CiviCRM,access CiviEvent</access_arguments>
      <page_type>1</page_type>
      <weight>800</weight>
      <component>CiviEvent</component>
@@ -62,7 +62,7 @@
      <title>Manage Events</title>
      <page_callback>CRM_Event_Page_ManageEvent</page_callback>
      <desc>Create and edit event configuration including times, locations, online registration forms, and fees. Links for iCal and RSS syndication.</desc>
-     <access_arguments>access CiviEvent</access_arguments>
+     <access_arguments>access CiviCRM,access CiviEvent</access_arguments>
      <adminGroup>CiviEvent</adminGroup>
      <icon>admin/small/event_manage.png</icon>
      <weight>370</weight>
diff --git a/CRM/Mailing/xml/Menu/Mailing.xml b/CRM/Mailing/xml/Menu/Mailing.xml
index 4ef34ab1ee..b4d45ce287 100644
--- a/CRM/Mailing/xml/Menu/Mailing.xml
+++ b/CRM/Mailing/xml/Menu/Mailing.xml
@@ -5,7 +5,7 @@
     <path>civicrm/mailing</path>
     <title>CiviMail</title>
     <page_callback>CRM_Mailing_Page_Browse</page_callback>
-    <access_arguments>access CiviMail;create mailings</access_arguments>
+    <access_arguments>access CiviCRM,access CiviMail;create mailings</access_arguments>
     <page_type>1</page_type>
     <weight>600</weight>
     <component>CiviMail</component>
@@ -15,7 +15,7 @@
     <title>Mailer Settings</title>
     <page_callback>CRM_Admin_Form_Setting_Mail</page_callback>
     <desc>Configure spool period, throttling and other mailer settings.</desc>
-    <access_arguments>access CiviMail</access_arguments>
+    <access_arguments>access CiviCRM,access CiviMail</access_arguments>
     <adminGroup>CiviMail</adminGroup>
     <icon>admin/small/07.png</icon>
     <weight>400</weight>
@@ -25,7 +25,7 @@
     <title>Headers, Footers, and Automated Messages</title>
     <page_callback>CRM_Mailing_Page_Component</page_callback>
     <desc>Configure the header and footer used for mailings. Customize the content of automated Subscribe, Unsubscribe, Resubscribe and Opt-out messages.</desc>
-    <access_arguments>access CiviMail</access_arguments>
+    <access_arguments>access CiviCRM,access CiviMail</access_arguments>
     <adminGroup>CiviMail</adminGroup>
     <icon>admin/small/Profile.png</icon>
     <weight>410</weight>
@@ -44,7 +44,7 @@
     <title>Mail Accounts</title>
     <page_callback>CRM_Admin_Page_MailSettings</page_callback>
     <desc>Configure email account setting.</desc>
-    <access_arguments>access CiviMail</access_arguments>
+    <access_arguments>access CiviCRM,access CiviMail</access_arguments>
     <adminGroup>CiviMail</adminGroup>
     <icon>admin/small/07.png</icon>
     <weight>420</weight>
diff --git a/CRM/Report/xml/Menu/Report.xml b/CRM/Report/xml/Menu/Report.xml
index a338fc124b..fe42f00389 100644
--- a/CRM/Report/xml/Menu/Report.xml
+++ b/CRM/Report/xml/Menu/Report.xml
@@ -49,7 +49,7 @@
      <title>Create New Report from Template</title>
      <page_callback>CRM_Report_Page_TemplateList</page_callback>
      <desc>Component wise listing of all available templates</desc>
-     <access_arguments>access CiviReport</access_arguments>
+     <access_arguments>access CiviCRM,access CiviReport</access_arguments>
      <adminGroup>CiviReport</adminGroup>
      <icon>admin/small/report_template.gif</icon>
   </item>
@@ -58,7 +58,7 @@
      <title>Manage Templates</title>
      <page_callback>CRM_Report_Page_Options</page_callback>
      <desc>Browse, Edit and Delete the Report templates.</desc>
-     <access_arguments>access CiviReport</access_arguments>
+     <access_arguments>access CiviCRM,access CiviReport</access_arguments>
      <adminGroup>CiviReport</adminGroup>
      <icon>admin/small/template.png</icon>
   </item>
-- 
2.25.1