fix CRM-21444: use contact_type name instead of label #11523
Merged
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 looks good to me & just needs a quick test. Can I get you to change the commit message to make more sense after it is merged |
f28a15b to
0ad6292
Compare
@eileenmcnaughton This should do it, right? |
|
Looks good - I feel happy with the testing Systopia has done per JIRA given that this looks clear cut from a code POV - adding merge on pass |
|
Merging as per tag. |
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
See https://issues.civicrm.org/jira/browse/CRM-21444
Before
The dedupe rule edit screen doesn't yield the fields in the dropdown, if the contact types' labels and names differ (e.g. in a localised environment).
After
The dedupe edit screen works again.
Technical Details
The code used the
labelwhere it should have used thename.