From 5511233ca43c8eafc53647a7749d14d9ad551703 Mon Sep 17 00:00:00 2001 From: Tyrell Cook Date: Mon, 28 Apr 2014 17:55:49 -0400 Subject: [PATCH] CRM-14247 applied Kurund patch --- CRM/Activity/BAO/Query.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php index 24ff055b14..47b4c2fc01 100644 --- a/CRM/Activity/BAO/Query.php +++ b/CRM/Activity/BAO/Query.php @@ -58,7 +58,8 @@ class CRM_Activity_BAO_Query { } if (!empty($query->_returnProperties['activity_type'])) { - $query->_select['activity_type'] = "activity_type.label as activity_type"; + $query->_select['activity_type'] = "activity_type.label as activity_type, + civicrm_activity.activity_type_id as activity_type_id"; $query->_element['activity_type'] = 1; $query->_tables['civicrm_activity'] = 1; $query->_tables['activity_type'] = 1; @@ -538,6 +539,7 @@ class CRM_Activity_BAO_Query { 'sort_name' => 1, 'display_name' => 1, 'activity_type' => 1, + 'activity_type_id' => 1, 'activity_subject' => 1, 'activity_date_time' => 1, 'activity_duration' => 1, -- 2.25.1