CRM-20841 - Dedupe - Show on_hold, is_bulkmail or signature merge… #10630
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 PR only handles checking whether a signature exists or not, but does not show a conflict if signatures only differ in their contents. |
tschuettler
changed the title
|
tested this & it seems like a display improvement without any noticeable downside |
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.
… conflicts
https://issues.civicrm.org/jira/projects/CRM/issues/CRM-20841
Overview
Displays the on_hold, bulkmail and signature status along the email adress in a merge form. If the email together its status differs between original and duplicate contact it is visually highlighted as a conflict.
Before
It is not shown that one of the emails is set to on hold and thus you may unitentionally overwrite that status.
After
Technical Details
It is using the same technique as for the address handling.
Comments
This PR only handles checking whether a signature exists or not, but does not show a conflict if signatures only differ in their contents.