From 74aa8a2ed705cfb536501ae7e0fdf427a8807145 Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Sat, 25 May 2019 16:18:13 +0100 Subject: [PATCH] Used color tags --- CRM/Activity/BAO/Query.php | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php index 764f2537da..2c4a0440a7 100644 --- a/CRM/Activity/BAO/Query.php +++ b/CRM/Activity/BAO/Query.php @@ -327,12 +327,15 @@ class CRM_Activity_BAO_Query { case 'activity_tags': $activityTags = CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', ['onlyActive' => FALSE]); + if (!is_array($value)) { + $value = explode(',', $value); + } + $names = []; - if (is_array($value)) { - foreach ($value as $k => $v) { - $names[] = $activityTags[$v]; - } + foreach ($value as $k => $v) { + $names[] = $activityTags[$v]; } + $query->_where[$grouping][] = "civicrm_activity_tag.tag_id IN (" . implode(",", $value) . ")"; $query->_qill[$grouping][] = ts('Activity Tag %1', [1 => $op]) . ' ' . implode(' ' . ts('OR') . ' ', $names); $query->_tables['civicrm_activity_tag'] = $query->_whereTables['civicrm_activity_tag'] = 1; @@ -524,10 +527,17 @@ class CRM_Activity_BAO_Query { ); $form->addYesNo('activity_test', ts('Activity is a Test?')); - $activity_tags = CRM_Core_BAO_Tag::getTags('civicrm_activity'); + $activity_tags = CRM_Core_BAO_Tag::getColorTags('civicrm_activity'); + if ($activity_tags) { - $form->add('select', 'activity_tags', ts('Activity Tag(s)'), $activity_tags, FALSE, - ['id' => 'activity_tags', 'multiple' => 'multiple', 'class' => 'crm-select2'] + $form->add('select2', 'activity_tags', ts('Activity Tag(s)'), + $activity_tags, FALSE, [ + 'id' => 'activity_tags', + 'multiple' => + 'multiple', + 'class' => 'crm-select2', + 'placeholder' => ts('- select -'), + ] ); } -- 2.25.1