dev/core#1109 - Fix merge not updating ContactReference fields #14983
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes an issue that causes ContactReference custom fields pointing to a duplicated contact that's being merged to not be updated to the main (surviving) contact.
|
(Standard links)
|
pfigel
commented
Aug 7, 2019
| @@ -2398,7 +2399,26 @@ public static function appendCustomTablesExtendingContacts(&$cidRefs) { | |||
| $customValueTables = CRM_Core_BAO_CustomGroup::getAllCustomGroupsByBaseEntity('Contact'); | |||
| $customValueTables->find(); | |||
| while ($customValueTables->fetch()) { | |||
| $cidRefs[$customValueTables->table_name] = ['entity_id']; | |||
| $cidRefs[$customValueTables->table_name][] = 'entity_id'; | |||
There was a problem hiding this comment.
NFC - just a bit more defensive as it doesn't muck things up if the call order is changed.
pfigel
commented
Aug 7, 2019
| @@ -918,7 +992,7 @@ public function setupMatchData() { | |||
| foreach ($fixtures as $fixture) { | |||
| $contactID = $this->individualCreate($fixture); | |||
| $this->contacts[] = array_merge($fixture, ['id' => $contactID]); | |||
| sleep(5); | |||
| sleep(2); | |||
|
I stepped through this test in debugger & it all makes sense & I agree that this data should be migrated - merging |
|
Thanks @eileenmcnaughton! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
When duplicates are merged, custom fields and other records pointing to the duplicate contact (i.e. the one that will be deleted) should be redirected to the main (surviving) contact.
Before
When a custom field of type
ContactReferenceexists, and values point to a contact used as the duplicate when merging, these records will not be updated to point to the main contact.After
ContactReferencecustom fields are updated to point to the main contact.Technical Details
CRM_Core_DAO::getReferencesToContactTable(), which was updated to includeContactReferencefields, is also used by some logging features, includingCRM_Logging_ReportDetail. Logging code generally has okay test coverage and I've manually tested some bits in the report.