From 1537953b045dadc092376f61180066fab82a9cea Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Fri, 9 Nov 2018 13:17:18 -0500 Subject: [PATCH] Constitiuent Detail Report: inner join to activity type --- CRM/Report/Form/Contact/Detail.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CRM/Report/Form/Contact/Detail.php b/CRM/Report/Form/Contact/Detail.php index 6ecf2aa977..b192e7c632 100644 --- a/CRM/Report/Form/Contact/Detail.php +++ b/CRM/Report/Form/Contact/Detail.php @@ -516,10 +516,11 @@ HERESQL; ON civicrm_activity_assignment.contact_id = {$this->_aliases['civicrm_activity_assignment']}.id LEFT JOIN civicrm_contact {$this->_aliases['civicrm_activity_source']} ON civicrm_activity_source.contact_id = {$this->_aliases['civicrm_activity_source']}.id - LEFT JOIN civicrm_option_value - ON ( {$this->_aliases['civicrm_activity']}.activity_type_id = civicrm_option_value.value ) - LEFT JOIN civicrm_option_group + JOIN civicrm_option_value + ON {$this->_aliases['civicrm_activity']}.activity_type_id = civicrm_option_value.value + JOIN civicrm_option_group ON civicrm_option_group.id = civicrm_option_value.option_group_id + AND civicrm_option_group.name = 'activity_type' LEFT JOIN civicrm_case_activity ON civicrm_case_activity.activity_id = {$this->_aliases['civicrm_activity']}.id LEFT JOIN civicrm_case @@ -690,8 +691,7 @@ HERESQL; WHERE ( civicrm_activity_source.contact_id IN ($selectedContacts) OR civicrm_activity_target.contact_id IN ($selectedContacts) OR civicrm_activity_assignment.contact_id IN ($selectedContacts) - OR civicrm_case_contact.contact_id IN ($selectedContacts) ) - AND civicrm_option_group.name = 'activity_type' + OR civicrm_case_contact.contact_id IN ($selectedContacts) ) AND {$this->_aliases['civicrm_activity']}.is_test = 0 AND ($componentClause) ORDER BY {$this->_aliases['civicrm_activity']}.activity_date_time desc -- 2.25.1