From c641ac454757f750d90ae7b90a67ec6953a2d43b Mon Sep 17 00:00:00 2001 From: eileen Date: Fri, 25 Sep 2020 14:07:58 +1200 Subject: [PATCH] [REF] Remove unused taskName variable This variable is only used at the tpl layer in export - there is a separate PR to change that usage to something more meaningful https://github.com/civicrm/civicrm-core/pull/18589 Other than that all this task assignment appears to be just cruft It's likely that it precedes other ways of setting the page title --- CRM/Activity/Form/Task.php | 2 -- CRM/Campaign/Form/Task.php | 3 --- CRM/Contact/Form/Task.php | 2 -- CRM/Contact/Form/Task/SaveSearch.php | 2 -- CRM/Contribute/Form/Task.php | 2 -- CRM/Core/Form/Task.php | 3 --- CRM/Event/Form/Task.php | 1 - CRM/Grant/Form/Task.php | 1 - CRM/Mailing/Form/Task.php | 2 -- CRM/Member/Form/Task.php | 1 - CRM/Pledge/Form/Task.php | 2 -- 11 files changed, 21 deletions(-) diff --git a/CRM/Activity/Form/Task.php b/CRM/Activity/Form/Task.php index 462499c38f..2b550eb813 100644 --- a/CRM/Activity/Form/Task.php +++ b/CRM/Activity/Form/Task.php @@ -48,8 +48,6 @@ class CRM_Activity_Form_Task extends CRM_Core_Form_Task { $values = $form->controller->exportValues($form->get('searchFormName')); $form->_task = $values['task']; - $activityTasks = CRM_Activity_Task::tasks(); - $form->assign('taskName', $activityTasks[$form->_task]); $ids = []; if ($values['radio_ts'] == 'ts_sel') { diff --git a/CRM/Campaign/Form/Task.php b/CRM/Campaign/Form/Task.php index f59cc30ea6..61411931d0 100644 --- a/CRM/Campaign/Form/Task.php +++ b/CRM/Campaign/Form/Task.php @@ -34,9 +34,6 @@ class CRM_Campaign_Form_Task extends CRM_Core_Form_Task { $values = $this->controller->exportValues('Search'); $this->_task = $values['task']; - $campaignTasks = CRM_Campaign_Task::tasks(); - $taskName = $campaignTasks[$this->_task] ?? NULL; - $this->assign('taskName', $taskName); $ids = []; if ($values['radio_ts'] == 'ts_sel') { diff --git a/CRM/Contact/Form/Task.php b/CRM/Contact/Form/Task.php index a7bd173701..198d64ba52 100644 --- a/CRM/Contact/Form/Task.php +++ b/CRM/Contact/Form/Task.php @@ -129,8 +129,6 @@ class CRM_Contact_Form_Task extends CRM_Core_Form_Task { $cacheKey = "civicrm search {$qfKey}"; $form->_task = self::$_searchFormValues['task'] ?? NULL; - $crmContactTaskTasks = CRM_Contact_Task::taskTitles(); - $form->assign('taskName', CRM_Utils_Array::value($form->_task, $crmContactTaskTasks)); // all contacts or action = save a search if ((CRM_Utils_Array::value('radio_ts', self::$_searchFormValues) == 'ts_all') || diff --git a/CRM/Contact/Form/Task/SaveSearch.php b/CRM/Contact/Form/Task/SaveSearch.php index a98a29fee0..f843f69ecb 100644 --- a/CRM/Contact/Form/Task/SaveSearch.php +++ b/CRM/Contact/Form/Task/SaveSearch.php @@ -53,9 +53,7 @@ class CRM_Contact_Form_Task_SaveSearch extends CRM_Contact_Form_Task { // Get Task name $modeValue = CRM_Contact_Form_Search::getModeValue(CRM_Utils_Array::value('component_mode', $values, CRM_Contact_BAO_Query::MODE_CONTACTS)); $className = $modeValue['taskClassName']; - $taskList = $className::taskTitles(); $this->_task = $values['task'] ?? NULL; - $this->assign('taskName', CRM_Utils_Array::value($this->_task, $taskList)); } /** diff --git a/CRM/Contribute/Form/Task.php b/CRM/Contribute/Form/Task.php index 16d6116667..e2f24b6562 100644 --- a/CRM/Contribute/Form/Task.php +++ b/CRM/Contribute/Form/Task.php @@ -58,8 +58,6 @@ class CRM_Contribute_Form_Task extends CRM_Core_Form_Task { $values = $form->controller->exportValues($form->get('searchFormName')); $form->_task = $values['task'] ?? NULL; - $contributeTasks = CRM_Contribute_Task::tasks(); - $form->assign('taskName', CRM_Utils_Array::value($form->_task, $contributeTasks)); $ids = []; if (isset($values['radio_ts']) && $values['radio_ts'] == 'ts_sel') { diff --git a/CRM/Core/Form/Task.php b/CRM/Core/Form/Task.php index a3bde1d8b6..579eefc533 100644 --- a/CRM/Core/Form/Task.php +++ b/CRM/Core/Form/Task.php @@ -95,9 +95,6 @@ abstract class CRM_Core_Form_Task extends CRM_Core_Form { $searchFormValues = $form->controller->exportValues($form->get('searchFormName')); $form->_task = $searchFormValues['task']; - $className = 'CRM_' . ucfirst($form::$entityShortname) . '_Task'; - $entityTasks = $className::tasks(); - $form->assign('taskName', $entityTasks[$form->_task]); $entityIds = []; if ($searchFormValues['radio_ts'] == 'ts_sel') { diff --git a/CRM/Event/Form/Task.php b/CRM/Event/Form/Task.php index 18962108a6..08d4f7cc9f 100644 --- a/CRM/Event/Form/Task.php +++ b/CRM/Event/Form/Task.php @@ -52,7 +52,6 @@ class CRM_Event_Form_Task extends CRM_Core_Form_Task { if (!array_key_exists($form->_task, $tasks)) { CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.')); } - $form->assign('taskName', $tasks[$form->_task]); $ids = []; if ($values['radio_ts'] == 'ts_sel') { diff --git a/CRM/Grant/Form/Task.php b/CRM/Grant/Form/Task.php index b983cec3d7..571c25433d 100644 --- a/CRM/Grant/Form/Task.php +++ b/CRM/Grant/Form/Task.php @@ -46,7 +46,6 @@ class CRM_Grant_Form_Task extends CRM_Core_Form_Task { if (!array_key_exists($form->_task, $tasks)) { CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.')); } - $form->assign('taskName', $tasks[$form->_task]); $ids = []; if ($values['radio_ts'] == 'ts_sel') { diff --git a/CRM/Mailing/Form/Task.php b/CRM/Mailing/Form/Task.php index 4a84746aaa..154a04ed3a 100644 --- a/CRM/Mailing/Form/Task.php +++ b/CRM/Mailing/Form/Task.php @@ -35,8 +35,6 @@ class CRM_Mailing_Form_Task extends CRM_Core_Form_Task { $values = $form->controller->exportValues($form->get('searchFormName')); $form->_task = $values['task'] ?? NULL; - $mailingTasks = CRM_Mailing_Task::tasks(); - $form->assign('taskName', CRM_Utils_Array::value('task', $values)); // ids are mailing event queue ids $ids = []; diff --git a/CRM/Member/Form/Task.php b/CRM/Member/Form/Task.php index 5f5791d01a..da684e433d 100644 --- a/CRM/Member/Form/Task.php +++ b/CRM/Member/Form/Task.php @@ -55,7 +55,6 @@ class CRM_Member_Form_Task extends CRM_Core_Form_Task { if (!array_key_exists($form->_task, $tasks)) { CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.')); } - $form->assign('taskName', $tasks[$form->_task]); $ids = []; if ($values['radio_ts'] === 'ts_sel') { diff --git a/CRM/Pledge/Form/Task.php b/CRM/Pledge/Form/Task.php index 2dc623f2fc..12df902a91 100644 --- a/CRM/Pledge/Form/Task.php +++ b/CRM/Pledge/Form/Task.php @@ -46,8 +46,6 @@ class CRM_Pledge_Form_Task extends CRM_Core_Form_Task { $values = $form->controller->exportValues('Search'); $form->_task = $values['task']; - $pledgeTasks = CRM_Pledge_Task::tasks(); - $form->assign('taskName', $pledgeTasks[$form->_task]); $ids = []; if ($values['radio_ts'] == 'ts_sel') { -- 2.25.1