From 6a84d0fbf91b3900fb4d210f857679d219153942 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sat, 4 Jan 2014 16:28:00 -0800 Subject: [PATCH] CRM-13997 - Fix gotv tabs to restore non-caching of content --- CRM/Campaign/Page/Vote.php | 13 ++----------- templates/CRM/Campaign/Page/Vote.tpl | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/CRM/Campaign/Page/Vote.php b/CRM/Campaign/Page/Vote.php index ed788a0e79..80365a198c 100644 --- a/CRM/Campaign/Page/Vote.php +++ b/CRM/Campaign/Page/Vote.php @@ -100,19 +100,10 @@ class CRM_Campaign_Page_Vote extends CRM_Core_Page { } function buildTabs() { - //check for required permissions. - $superUser = FALSE; - if (CRM_Core_Permission::check('manage campaign') || - CRM_Core_Permission::check('administer CiviCampaign') - ) { - $superUser = TRUE; - } - $allTabs = array(); foreach ($this->_tabs as $name => $title) { - if (!$superUser && - !CRM_Core_Permission::check("{$name} campaign contacts") - ) { + // check for required permissions. + if (!CRM_Core_Permission::check(array(array('manage campaign', 'administer CiviCampaign', "{$name} campaign contacts")))) { continue; } diff --git a/templates/CRM/Campaign/Page/Vote.tpl b/templates/CRM/Campaign/Page/Vote.tpl index be6f87637b..18bd33ed70 100644 --- a/templates/CRM/Campaign/Page/Vote.tpl +++ b/templates/CRM/Campaign/Page/Vote.tpl @@ -32,6 +32,21 @@ {include file='CRM/Campaign/Form/Gotv.tpl'} {elseif $tabHeader} {include file="CRM/common/TabHeader.tpl"} + + {else}
-- 2.25.1