Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284266
Change subject: Add comments, underscore in key
......................................................................
Add comments, underscore in key
Change-Id: I88ed9324ff869213c28ee2ca50c6d40337d0cc9f
---
M CRM/Report/Form/Contact/LoggingSummary.php
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm
refs/changes/66/284266/1
diff --git a/CRM/Report/Form/Contact/LoggingSummary.php
b/CRM/Report/Form/Contact/LoggingSummary.php
index 030191a..94dc3fe 100644
--- a/CRM/Report/Form/Contact/LoggingSummary.php
+++ b/CRM/Report/Form/Contact/LoggingSummary.php
@@ -204,6 +204,9 @@
$row['log_civicrm_entity_altered_contact'] =
$row['log_civicrm_entity_altered_contact'] . " [{$entity}]";
}
if ($entity == 'Contact Merged') {
+ // We're looking at a merge activity created against the surviving
+ // contact record. There should be a single activity created against
+ // the deleted contact record, with this activity as parent.
$deletedID = CRM_Core_DAO::singleValueQuery('
SELECT GROUP_CONCAT(contact_id) FROM civicrm_activity_contact ac
INNER JOIN civicrm_activity a
@@ -232,6 +235,9 @@
$row['log_civicrm_entity_log_action'] = ts('Update');
}
+ // For certain tables, we may want to look at an alternate column to
+ // determine which action to display, determined by the 'action_column'
+ // key of the entry in $this->_logTables.
if ($newAction = $this->getEntityAction($row['log_civicrm_entity_id'],
$row['log_civicrm_entity_log_conn_id'],
$row['log_civicrm_entity_log_type'],
@@ -248,13 +254,16 @@
$row = $this->addDetailReportLinksToRow($baseQueryCriteria, $row);
}
+ // In the summary, we only want to show one row per entity type,
+ // connection ID, contact ID, and user ID, rolling up multiple
+ // related actions against the same entity.
$key = $date . '_' .
$row['log_civicrm_entity_log_type'] . '_' .
// This ensures merge activities are not 'lost' by aggregation.
// I would prefer not to lose other entities either but it's a
balancing act as
// described in https://issues.civicrm.org/jira/browse/CRM-12867 so
adding this criteria
// while hackish saves us from figuring out if the original decision
is still good.
- $isMerge .
+ $isMerge . '_' .
$row['log_civicrm_entity_log_conn_id'] . '_' .
$row['log_civicrm_entity_log_user_id'] . '_' .
$row['log_civicrm_entity_altered_contact_id'];
--
To view, visit https://gerrit.wikimedia.org/r/284266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88ed9324ff869213c28ee2ca50c6d40337d0cc9f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
