From 223f7f471f0352b07b1746ea89454a254ef2a5a3 Mon Sep 17 00:00:00 2001 From: yashodha Date: Tue, 27 Aug 2013 13:29:19 +0530 Subject: [PATCH] fix for activity restructure --- CRM/Report/Form/Activity.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php index 4aece0694f..129c369042 100644 --- a/CRM/Report/Form/Activity.php +++ b/CRM/Report/Form/Activity.php @@ -333,7 +333,7 @@ class CRM_Report_Form_Activity extends CRM_Report_Form { $orderByRef = "activity_assignment_civireport.contact_id"; if (in_array($fieldName, array( 'contact_target', 'target_contact_id'))) { - $orderByRef = "activity_target_civireport.target_contact_id"; + $orderByRef = "activity_target_civireport.contact_id"; } $select[] = "GROUP_CONCAT(DISTINCT {$field['dbAlias']} ORDER BY {$orderByRef} SEPARATOR '{$seperator}') as {$tableName}_{$fieldName}"; } @@ -659,7 +659,7 @@ class CRM_Report_Form_Activity extends CRM_Report_Form { ) { $this->_from .= " LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} - ON ({$this->_aliases['civicrm_activity_target']}.target_contact_id = + ON ({$this->_aliases['civicrm_activity_target']}.contact_id = {$this->_aliases['civicrm_address']}.contact_id) AND {$this->_aliases['civicrm_address']}.is_primary = 1\n"; } -- 2.25.1