Merge pull request #2332 from colemanw/CRM-13996

[civicrm-core.git] / CRM / Report / Form / Contact / Log.php

diff --git a/CRM/Report/Form/Contact/Log.php b/CRM/Report/Form/Contact/Log.php
index 72f98308dc8535afd54d764d63cde9d8111d1dd6..b714015e1261cac24ad9702e261d7690e75c9dcc 100644 (file)
--- a/CRM/Report/Form/Contact/Log.php
+++ b/CRM/Report/Form/Contact/Log.php
@@ -2,7 +2,7 @@
 
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -106,7 +106,15 @@ class CRM_Report_Form_Contact_Log extends CRM_Report_Form {
           'activity_type_id' => array('title' => ts('Activity Type'),
             'required' => TRUE,
           ),
-          'source_contact_id' => array(
+        ),
+      ),
+      'civicrm_activity_source' =>
+      array(
+        'dao' => 'CRM_Activity_DAO_ActivityContact',
+        'fields' =>
+        array(
+          'contact_id' =>
+          array(
             'no_display' => TRUE,
             'required' => TRUE,
           ),
@@ -171,11 +179,16 @@ class CRM_Report_Form_Contact_Log extends CRM_Report_Form {
   }
 
   function from() {
+    $activityContacts = CRM_Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'name');
+    $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);
     $this->_from = "
         FROM civicrm_log {$this->_aliases['civicrm_log']}
         inner join civicrm_contact {$this->_aliases['civicrm_contact']} on {$this->_aliases['civicrm_log']}.modified_id = {$this->_aliases['civicrm_contact']}.id
         left join civicrm_contact {$this->_aliases['civicrm_contact_touched']} on ({$this->_aliases['civicrm_log']}.entity_table='civicrm_contact' AND {$this->_aliases['civicrm_log']}.entity_id = {$this->_aliases['civicrm_contact_touched']}.id)
         left join civicrm_activity {$this->_aliases['civicrm_activity']} on ({$this->_aliases['civicrm_log']}.entity_table='civicrm_activity' AND {$this->_aliases['civicrm_log']}.entity_id = {$this->_aliases['civicrm_activity']}.id)
+        LEFT JOIN civicrm_activity_contact {$this->_aliases['civicrm_activity_source']} ON
+          {$this->_aliases['civicrm_activity']}.id = {$this->_aliases['civicrm_activity_source']}.activity_id AND
+          {$this->_aliases['civicrm_activity_source']}.record_type_id = {$sourceID}
         ";
   }