From 3ae89fd792cc7f8026cf760fb84b15fac6892135 Mon Sep 17 00:00:00 2001 From: jitendrapurohit Date: Thu, 22 May 2014 19:12:21 +0530 Subject: [PATCH] CRM-14373 --- CRM/Report/Form/Activity.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php index f37b97f100..017165dd4d 100644 --- a/CRM/Report/Form/Activity.php +++ b/CRM/Report/Form/Activity.php @@ -308,7 +308,6 @@ class CRM_Report_Form_Activity extends CRM_Report_Form { function select($recordType = NULL) { if (!array_key_exists("contact_{$recordType}", $this->_params['fields']) && $recordType != 'final') { $this->_nonDisplayFields[] = "civicrm_contact_contact_{$recordType}"; - $this->_params['fields']["contact_{$recordType}"] = 1; } parent::select(); @@ -583,10 +582,10 @@ GROUP BY civicrm_activity_id {$this->_having} {$this->_orderBy}"; $nullFilters = array(); foreach (array('target', 'source', 'assignee') as $type) { if (CRM_Utils_Array::value("contact_{$type}_op", $this->_params) == 'nnll' || !empty($this->_params["contact_{$type}_value"])) { - $nullFilters[] = " civicrm_contact_contact_{$type} IS NOT NULL "; + $nullFilters[] = " civicrm_contact_contact_{$type}_id IS NOT NULL "; } else if (CRM_Utils_Array::value("contact_{$type}_op", $this->_params) == 'nll') { - $nullFilters[] = " civicrm_contact_contact_{$type} IS NULL "; + $nullFilters[] = " civicrm_contact_contact_{$type}_id IS NULL "; } } -- 2.25.1