CRM-16776 - additional bug fixes

diff --git a/CRM/Contribute/Form/ContributionPage.php b/CRM/Contribute/Form/ContributionPage.php
index 8f7a1c39c0f39dad6327f1a93d3535d0afa8afb4..86902cab974391789abcca3d89385d8e43cfa75a 100644 (file)
--- a/CRM/Contribute/Form/ContributionPage.php
+++ b/CRM/Contribute/Form/ContributionPage.php
@@ -109,6 +109,10 @@ class CRM_Contribute_Form_ContributionPage extends CRM_Core_Form {
       }
     }
 
+    // CRM-16776 - show edit/copy/create buttons on Profiles Tab if user has required permission.
+    if (CRM_Core_Permission::check('administer CiviCRM')) {
+      $this->assign('perm', TRUE);
+    }
     // set up tabs
     CRM_Contribute_Form_ContributionPage_TabHeader::build($this);
 

diff --git a/CRM/Contribute/Form/ContributionPage/Custom.php b/CRM/Contribute/Form/ContributionPage/Custom.php
index ea730d09f261adb10463eee9e91ff8f44b15c584..ff76aaaa46474d6f1eccab1aeb2c20abbf8b9b47 100644 (file)
--- a/CRM/Contribute/Form/ContributionPage/Custom.php
+++ b/CRM/Contribute/Form/ContributionPage/Custom.php
@@ -98,9 +98,6 @@ class CRM_Contribute_Form_ContributionPage_Custom extends CRM_Contribute_Form_Co
       CRM_Utils_System::setTitle(ts('Include Profiles') . " ($title)");
     }
 
-    if (CRM_Core_Permission::check('administer CiviCRM')) {
-      $this->assign('perm', 1);
-    }
     $ufJoinParams = array(
       'module' => 'CiviContribute',
       'entity_table' => 'civicrm_contribution_page',

diff --git a/CRM/Event/Form/ManageEvent.php b/CRM/Event/Form/ManageEvent.php
index 29219519e8f8b896e5f4b6c55d4af5d5504e1910..b598858db180a363d8302774e0d54f997c4b6b2b 100644 (file)
--- a/CRM/Event/Form/ManageEvent.php
+++ b/CRM/Event/Form/ManageEvent.php
@@ -191,6 +191,20 @@ class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
       $this->assign('isRepeatingEntity', $isRepeatingEntity);
     }
 
+    // CRM-16776 - show edit/copy/create buttons for Profiles if user has required permission.
+    $ufGroups = CRM_Core_PseudoConstant::get('CRM_Core_DAO_UFField', 'uf_group_id');
+    $ufCreate = CRM_ACL_API::group(CRM_Core_Permission::CREATE, NULL, 'civicrm_uf_group', $ufGroups);
+    $ufEdit = CRM_ACL_API::group(CRM_Core_Permission::EDIT, NULL, 'civicrm_uf_group', $ufGroups);
+    $checkPermission = array(
+      array(
+        'administer CiviCRM',
+        'manage event profiles',
+      ),
+    );
+    if (CRM_Core_Permission::check($checkPermission) || !empty($ufCreate) || !empty($ufEdit)) {
+      $this->assign('perm', TRUE);
+    }
+
     // also set up tabs
     CRM_Event_Form_ManageEvent_TabHeader::build($this);
 

diff --git a/CRM/Event/Form/ManageEvent/Registration.php b/CRM/Event/Form/ManageEvent/Registration.php
index 5c4392ac38764db048620d153b2ff7b8b3e8cf3b..3a24bb1d96838998bdafd0c0f1943523bcd73600 100644 (file)
--- a/CRM/Event/Form/ManageEvent/Registration.php
+++ b/CRM/Event/Form/ManageEvent/Registration.php
@@ -75,20 +75,6 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent
       }
     }
 
-    $this->assign('perm', 0);
-    $ufGroups = CRM_Core_PseudoConstant::get('CRM_Core_DAO_UFField', 'uf_group_id');
-    $ufCreate = CRM_ACL_API::group(CRM_Core_Permission::CREATE, NULL, 'civicrm_uf_group', $ufGroups);
-    $ufEdit = CRM_ACL_API::group(CRM_Core_Permission::EDIT, NULL, 'civicrm_uf_group', $ufGroups);
-    $checkPermission = array(
-      array(
-        'administer CiviCRM',
-        'manage event profiles',
-      ),
-    );
-    if (CRM_Core_Permission::check($checkPermission) || !empty($ufCreate) || !empty($ufEdit)) {
-      $this->assign('perm', 1);
-    }
-
     $this->assign('addProfileBottomAdd', $this->_addProfileBottomAdd);
     $this->assign('profileBottomNumAdd', $this->_profileBottomNumAdd);
 

diff --git a/templates/CRM/UF/Page/ProfileTemplates.tpl b/templates/CRM/UF/Page/ProfileTemplates.tpl
index 7c5a78a6fdf45c38238f664af54396b18ba462c5..514fac23d06bc42e075e965e18dc08c6b6c1a920 100644 (file)
--- a/templates/CRM/UF/Page/ProfileTemplates.tpl
+++ b/templates/CRM/UF/Page/ProfileTemplates.tpl
@@ -115,7 +115,7 @@
     <div>
         <span class="crm-profile-selector-select"></span>
         <button type="button" class="crm-profile-selector-preview" title="{ts}Preview{/ts}"><div class="icon ui-icon-zoomin">{ts}Preview{/ts}</div></button>
-        {if $perm EQ 1}
+        {if $perm}
           <button class="crm-profile-selector-edit">{ts}Edit{/ts}</button>
           <button class="crm-profile-selector-copy">{ts}Copy{/ts}</button>
           <button class="crm-profile-selector-create">{ts}Create{/ts}</button>