From 9a8bb100c38ded29b0c7426e183150d50a7d5b48 Mon Sep 17 00:00:00 2001 From: colemanw Date: Wed, 2 Aug 2023 23:13:58 -0400 Subject: [PATCH] ScheduledReminders - Remove unnecessary template coupling --- CRM/Event/Form/ManageEvent/ScheduleReminders.php | 5 ++--- templates/CRM/Admin/Page/ScheduleReminders.tpl | 6 ------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CRM/Event/Form/ManageEvent/ScheduleReminders.php b/CRM/Event/Form/ManageEvent/ScheduleReminders.php index f0f7ad5595..0c786bfb9f 100644 --- a/CRM/Event/Form/ManageEvent/ScheduleReminders.php +++ b/CRM/Event/Form/ManageEvent/ScheduleReminders.php @@ -30,7 +30,6 @@ class CRM_Event_Form_ManageEvent_ScheduleReminders extends CRM_Event_Form_Manage public function preProcess() { parent::preProcess(); $this->setSelectedChild('reminder'); - $setTab = CRM_Utils_Request::retrieve('setTab', 'Int', $this, FALSE, 0); $mapping = CRM_Core_BAO_ActionSchedule::getMapping($this->_isTemplate ? CRM_Event_ActionMapping::EVENT_TPL_MAPPING_ID : CRM_Event_ActionMapping::EVENT_NAME_MAPPING_ID); $reminderList = CRM_Core_BAO_ActionSchedule::getList($mapping, $this->_id); @@ -60,7 +59,6 @@ class CRM_Event_Form_ManageEvent_ScheduleReminders extends CRM_Event_Form_Manage } $this->assign('rows', $reminderList); - $this->assign('setTab', $setTab); $this->assign('addNewLink', $scheduleReminder->getLinkPath('add') . "&mapping_id={$mapping->getId()}&entity_value={$this->_id}"); // Update tab "disabled" css class @@ -72,7 +70,8 @@ class CRM_Event_Form_ManageEvent_ScheduleReminders extends CRM_Event_Form_Manage * @return string */ public function getTemplateFileName() { - return 'CRM/Admin/Page/ScheduleReminders.tpl'; + $setTab = CRM_Utils_Request::retrieve('setTab', 'Int', NULL, FALSE, 0); + return $setTab ? 'CRM/Event/Form/ManageEvent/Tab.tpl' : 'CRM/Admin/Page/ScheduleReminders.tpl'; } } diff --git a/templates/CRM/Admin/Page/ScheduleReminders.tpl b/templates/CRM/Admin/Page/ScheduleReminders.tpl index c58cc5e0de..12670edc24 100644 --- a/templates/CRM/Admin/Page/ScheduleReminders.tpl +++ b/templates/CRM/Admin/Page/ScheduleReminders.tpl @@ -8,11 +8,6 @@ +--------------------------------------------------------------------+ *} {* this template is for configuring Scheduled Reminders *} -{if !empty($setTab) and $setTab eq 1} - {if !empty($component) and $component eq 'event'} - {include file="CRM/Event/Form/ManageEvent/Tab.tpl"} - {/if} -{else} {if $action eq 1 or $action eq 2 or $action eq 8 or $action eq 16384} {include file="CRM/Admin/Form/ScheduleReminders.tpl"} {else} @@ -38,4 +33,3 @@ {/if} -{/if} -- 2.25.1