From 9f7f7f2b4b9b162d379fb18e6548a3c721326c01 Mon Sep 17 00:00:00 2001
From: Monish Deb <deb.monish@gmail.com>
Date: Mon, 20 Apr 2020 22:37:03 +0530
Subject: [PATCH 1/2] m
---
CRM/AOReports/Form/Report/ExtendedActivity.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/CRM/AOReports/Form/Report/ExtendedActivity.php b/CRM/AOReports/Form/Report/ExtendedActivity.php
index 900b209..c42c532 100644
--- a/CRM/AOReports/Form/Report/ExtendedActivity.php
+++ b/CRM/AOReports/Form/Report/ExtendedActivity.php
@@ -9,6 +9,7 @@ class CRM_AOReports_Form_Report_ExtendedActivity extends CRM_Report_Form_Activit
* @return string
*/
public function buildQuery($applyLimit = TRUE) {
+ $this->_aliases['civicrm_case_activity'] = 'case_activity_civireport';
$activityContacts = CRM_Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validate');
$sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);
$assigneeID = CRM_Utils_Array::key('Activity Assignee', $activityContacts);
--
GitLab
From b80b586b959e2f1f058f7b699e19c2a9c4f781bc Mon Sep 17 00:00:00 2001
From: Monish Deb <deb.monish@gmail.com>
Date: Mon, 20 Apr 2020 22:37:52 +0530
Subject: [PATCH 2/2] AOSL-498
---
aoreports.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/aoreports.php b/aoreports.php
index 14e4689..0cde2cd 100644
--- a/aoreports.php
+++ b/aoreports.php
@@ -135,12 +135,17 @@ function aoreports_civicrm_entityTypes(&$entityTypes) {
}
function aoreports_civicrm_alterReportVar($type, &$columns, &$form) {
- if ('CRM_AOReports_Form_Report_ExtendedActivity' == get_class($form) && $type == 'sql' && is_string($columns) && strstr($_GET['q'], 'instance/52')) {
- $contactID = CRM_Core_Session::singleton()->get('userID');
+ if ('CRM_AOReports_Form_Report_ExtendedActivity' == get_class($form) && $type == 'sql' && is_string($columns) && (strstr($_GET['q'], 'instance/52') || strstr($_GET['q'], 'instance/148'))) {
+ $contactID = CRM_Core_Session::singleton()->get('userID');
$match = "AND contact_id = {$contactID}";
$replace = "AND contact_id = 404318";
$columns = str_replace($match, $replace, $columns);
}
+ if ('CRM_Report_Form_Activity' == get_class($form)) {
+ $aliases = $form->getVar('_aliases');
+ $aliases['civicrm_case_activity'] = 'case_activity_civireport';
+ $form->setVar('_aliases', $aliases);
+ }
if ('CRM_Report_Form_Contribute_Bookkeeping' == get_class($form) && $type == 'columns') {
$columns['civicrm_batch']['filters']['batch_id'] = [
'name' => 'id',
--
GitLab