[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 civicrm#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
eileenmcnaughton · Sep 25, 2020 · c641ac4 · c641ac4
1 parent 64c8be5
commit c641ac4
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 21 deletions.
diff --git a/CRM/Activity/Form/Task.php b/CRM/Activity/Form/Task.php
@@ -48,8 +48,6 @@ public static function preProcessCommon(&$form) {
     $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
@@ -34,9 +34,6 @@ public function preProcess() {
     $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
@@ -129,8 +129,6 @@ public static function preProcessCommon(&$form) {
     $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
@@ -53,9 +53,7 @@ public function preProcess() {
     // 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
@@ -58,8 +58,6 @@ public static function preProcessCommon(&$form) {
     $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
@@ -95,9 +95,6 @@ public static function preProcessCommon(&$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
@@ -52,7 +52,6 @@ public static function preProcessCommon(&$form) {
     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
@@ -46,7 +46,6 @@ public static function preProcessCommon(&$form) {
     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
@@ -35,8 +35,6 @@ public static function preProcessCommon(&$form) {
     $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
@@ -55,7 +55,6 @@ public static function preProcessCommon(&$form) {
     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
@@ -46,8 +46,6 @@ public static function preProcessCommon(&$form) {
     $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') {