Convert Activity to use core Task class

[civicrm-core.git] / CRM / Activity / Form / Search.php

diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php
index 91917d117972c770ae818887512906c2481c63eb..6bbd12db9b9597f0a9afa52375e87040c1febb9a 100644 (file)
--- a/CRM/Activity/Form/Search.php
+++ b/CRM/Activity/Form/Search.php
@@ -98,6 +98,13 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search {
     }
     else {
       $this->_formValues = $this->get('formValues');
+
+      if ($this->_force) {
+        // If we force the search then merge form values with url values
+        // and set submit values to form values.
+        $this->_formValues = array_merge((array) $this->_formValues, CRM_Utils_Request::exportValues());
+        $this->_submitValues = $this->_formValues;
+      }
     }
 
     if (empty($this->_formValues)) {
@@ -163,9 +170,7 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search {
         $this->addRowSelectors($rows);
       }
 
-      $permission = CRM_Core_Permission::getPermission();
-
-      $this->addTaskMenu(CRM_Activity_Task::permissionedTaskTitles($permission));
+      $this->addTaskMenu(CRM_Activity_Task::permissionedTaskTitles(CRM_Core_Permission::getPermission()));
     }
 
   }
@@ -195,9 +200,14 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search {
       $specialParams = array(
         'activity_type_id',
         'status_id',
+        'priority_id',
         'activity_text',
       );
-      $changeNames = array('status_id' => 'activity_status_id');
+      $changeNames = array(
+        'status_id' => 'activity_status_id',
+        'priority_id' => 'activity_priority_id',
+      );
+
       CRM_Contact_BAO_Query::processSpecialFormValue($this->_formValues, $specialParams, $changeNames);
     }