From 15a788af62bc20347830e23ae6856d9077eb5be0 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Wed, 15 May 2019 00:08:47 +0100
Subject: [PATCH] Change Activity tag to use select2

---
 CRM/Activity/BAO/Query.php                    |  9 +++-----
 templates/CRM/Activity/Form/Search/Common.tpl | 21 ++++++++-----------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php
index 8f7cd076b8..764f2537da 100644
--- a/CRM/Activity/BAO/Query.php
+++ b/CRM/Activity/BAO/Query.php
@@ -325,7 +325,6 @@ class CRM_Activity_BAO_Query {
         }
 
       case 'activity_tags':
-        $value = array_keys($value);
         $activityTags = CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', ['onlyActive' => FALSE]);
 
         $names = [];
@@ -527,11 +526,9 @@ class CRM_Activity_BAO_Query {
     $form->addYesNo('activity_test', ts('Activity is a Test?'));
     $activity_tags = CRM_Core_BAO_Tag::getTags('civicrm_activity');
     if ($activity_tags) {
-      foreach ($activity_tags as $tagID => $tagName) {
-        $form->_tagElement = &$form->addElement('checkbox', "activity_tags[$tagID]",
-          NULL, $tagName
-        );
-      }
+      $form->add('select', 'activity_tags', ts('Activity Tag(s)'), $activity_tags, FALSE,
+        ['id' => 'activity_tags', 'multiple' => 'multiple', 'class' => 'crm-select2']
+      );
     }
 
     $parentNames = CRM_Core_BAO_Tag::getTagSet('civicrm_activity');
diff --git a/templates/CRM/Activity/Form/Search/Common.tpl b/templates/CRM/Activity/Form/Search/Common.tpl
index e9ac9139fa..15f597a101 100644
--- a/templates/CRM/Activity/Form/Search/Common.tpl
+++ b/templates/CRM/Activity/Form/Search/Common.tpl
@@ -74,20 +74,17 @@
       </td></tr>
     </table>
   </td>
-  {if $form.activity_tags}
-    <td><label>{ts}Activity Tag(s){/ts}</label>
-      <div id="Tags" class="listing-box">
-        {foreach from=$form.activity_tags item="tag_val"}
-          <div class="{cycle values='odd-row,even-row'}">
-            {$tag_val.html}
-          </div>
-        {/foreach}
-    </td>
-  {else}
-    <td>&nbsp;</td>
-  {/if}
 </tr>
 
+{if $form.activity_tags}
+  <tr>
+    <td><label>{$form.activity_tags.label}</label>
+      <br/>
+      {$form.activity_tags.html}
+    </td>
+  </tr>
+{/if}
+
 <tr>
   {include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="activity_date_time" colspan="2"}
   <td>&nbsp;</td>
-- 
2.25.1