CRM-12882 - Allow all admins to view payment processors page. Clarify error message...

----------------------------------------
* CRM-12882:
  https://issues.civicrm.org/jira/browse/CRM-12882

diff --git a/CRM/Admin/Form/PaymentProcessor.php b/CRM/Admin/Form/PaymentProcessor.php
index fdad420b72cedc9b6e734498301197290cf4c0bb..8453954760ec318cfc69c13dd397b538399123ae 100644 (file)
--- a/CRM/Admin/Form/PaymentProcessor.php
+++ b/CRM/Admin/Form/PaymentProcessor.php
@@ -48,7 +48,7 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form {
 
   function preProcess() {
     if(!CRM_Core_Permission::check('administer payment processors')) {
-      CRM_Core_Error::fatal('You do not have permission to administer payment processors');
+      CRM_Core_Error::fatal('The \'administer payment processors\' permission is required to add or edit a payment processor.');
     }
     parent::preProcess();
 

diff --git a/CRM/Core/xml/Menu/Admin.xml b/CRM/Core/xml/Menu/Admin.xml
index b26ac03b4c79b0865d3f5f768bdbf0aa20e56e36..8877a7d03003fa4f12c45828d2bb6c6914358644 100644 (file)
--- a/CRM/Core/xml/Menu/Admin.xml
+++ b/CRM/Core/xml/Menu/Admin.xml
@@ -461,7 +461,6 @@
      <desc>Payment Processor setup for CiviCRM transactions</desc>
      <page_callback>CRM_Admin_Page_PaymentProcessor</page_callback>
      <adminGroup>System Settings</adminGroup>
-     <access_arguments>administer payment processors</access_arguments>
      <icon>admin/small/online_contribution_pages.png</icon>
      <weight>30</weight>
   </item>
@@ -476,7 +475,7 @@
   <item>
      <path>civicrm/admin/setting/misc</path>
      <title>Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)</title>
-   <desc>Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.</desc>
+        <desc>Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.</desc>
      <page_callback>CRM_Admin_Form_Setting_Miscellaneous</page_callback>
      <adminGroup>System Settings</adminGroup>
      <icon>admin/small/36.png</icon>