From d934f895dab742ffe39937452c88070faeb95fef Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 2 Jul 2019 17:22:39 +1200
Subject: [PATCH] Activity search - convert priority_id to a metadata field and
 add location

The location field on activity in a generally exposed field so it makes sense it should be in the search. Priority_id
conversion is part of ongoing standardisation which includes adding url parameter support for the field
---
 CRM/Activity/BAO/Query.php                    | 17 ++++-------------
 templates/CRM/Activity/Form/Search/Common.tpl |  5 +++++
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php
index 2c4a0440a7..c096ebc819 100644
--- a/CRM/Activity/BAO/Query.php
+++ b/CRM/Activity/BAO/Query.php
@@ -463,7 +463,7 @@ class CRM_Activity_BAO_Query {
    * rather than a static function.
    */
   public static function getSearchFieldMetadata() {
-    $fields = ['activity_type_id', 'activity_date_time'];
+    $fields = ['activity_type_id', 'activity_date_time', 'priority_id', 'activity_location'];
     $metadata = civicrm_api3('Activity', 'getfields', [])['values'];
     return array_intersect_key($metadata, array_flip($fields));
   }
@@ -515,17 +515,6 @@ class CRM_Activity_BAO_Query {
     $form->addRadio('activity_option', '', CRM_Core_SelectValues::activityTextOptions());
     $form->setDefaults(['activity_option' => 'both']);
 
-    $priority = CRM_Core_PseudoConstant::get('CRM_Activity_DAO_Activity', 'priority_id');
-    $form->addSelect('priority_id',
-      [
-        'entity' => 'activity',
-        'label' => ts('Priority'),
-        'multiple' => 'multiple',
-        'option_url' => NULL,
-        'placeholder' => ts('- any -'),
-      ]
-    );
-
     $form->addYesNo('activity_test', ts('Activity is a Test?'));
     $activity_tags = CRM_Core_BAO_Tag::getColorTags('civicrm_activity');
 
@@ -680,7 +669,9 @@ class CRM_Activity_BAO_Query {
    * Where/qill clause for notes
    *
    * @param array $values
-   * @param object $query
+   * @param CRM_Contact_BAO_Query $query
+   *
+   * @throws \CRM_Core_Exception
    */
   public static function whereClauseSingleActivityText(&$values, &$query) {
     list($name, $op, $value, $grouping, $wildcard) = $values;
diff --git a/templates/CRM/Activity/Form/Search/Common.tpl b/templates/CRM/Activity/Form/Search/Common.tpl
index 15f597a101..b62d8c1da0 100644
--- a/templates/CRM/Activity/Form/Search/Common.tpl
+++ b/templates/CRM/Activity/Form/Search/Common.tpl
@@ -110,6 +110,11 @@
     &nbsp; {$form.activity_test.html}
   </td>
 </tr>
+<tr>
+<td>{$form.activity_location.label}<br />
+  {$form.activity_location.html}</td>
+<td></td>
+</tr>
 {if $buildSurveyResult }
   <tr>
     <td id="activityResult">
-- 
2.25.1