}
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)) {
$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()));
}
}
$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);
}