From cec82bce1ef8b16903d58a8ff01a5b23a6eb64bd Mon Sep 17 00:00:00 2001 From: yashodha Date: Fri, 22 Nov 2013 18:37:55 +0530 Subject: [PATCH] CRM-13812 - fixed the broken query for activity search --- CRM/Activity/BAO/Activity.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index 910aa49696..d46b1e3be7 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -678,7 +678,7 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { 'activity_date_time' => 'datetime', 'status_id' => 'int unsigned', 'subject' => 'varchar(255)', - 'source_record_id' => 'int unsigned', + 'source_contact_name' => 'varchar(255)', 'activity_type_id' => 'int unsigned', 'activity_type' => 'varchar(128)', 'case_id' => 'int unsigned', @@ -1051,8 +1051,11 @@ LEFT JOIN civicrm_case_activity ON ( civicrm_case_activity.activity_id = tbl.a // build main activity table select clause $sourceSelect = ''; + + $activityContacts = CRM_Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'name'); + $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); $sourceJoin = " -INNER JOIN civicrm_activity_contact ac ON ac.activity_id = civicrm_activity.id +INNER JOIN civicrm_activity_contact ac ON ac.activity_id = civicrm_activity.id AND record_type_id = {$sourceID} INNER JOIN civicrm_contact contact ON ac.contact_id = contact.id "; @@ -1061,7 +1064,7 @@ INNER JOIN civicrm_contact contact ON ac.contact_id = contact.id civicrm_activity.activity_date_time, civicrm_activity.status_id, civicrm_activity.subject, - civicrm_activity.source_record_id, + contact.sort_name as source_contact_name, civicrm_option_value.value as activity_type_id, civicrm_option_value.label as activity_type, null as case_id, null as case_subject, @@ -1096,7 +1099,7 @@ INNER JOIN civicrm_contact contact ON ac.contact_id = contact.id civicrm_activity.status_id, civicrm_activity.subject, ac.contact_id, - civicrm_activity.source_record_id, + contact.sort_name as source_contact_name, civicrm_option_value.value as activity_type_id, civicrm_option_value.label as activity_type, null as case_id, null as case_subject, -- 2.25.1