[REF] [EXPORT] cleanup setting of additional postal fields #14790
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
Further cleanup
|
(Standard links)
|
| $fields = ['is_deceased', 'do_not_mail', 'street_address', 'supplemental_address_1']; | ||
| foreach ($fields as $index => $field) { | ||
| if (!empty($this->getReturnProperties()[$field])) { | ||
| unset($field[$index]); |
There was a problem hiding this comment.
@eileenmcnaughton this seems different to the previous code also the previous code seems to ensure that $this->getReturnProperties() gets added if the field is added to that array if we can't find it already
There was a problem hiding this comment.
Right the array of additionalFieldsForPostalExport is now merged in when we retrieve it
https://github.com/civicrm/civicrm-core/pull/14790/files#diff-ab4b10ab1ddedcbcc3be13fb06348789R347
So we can get it separately for some purpose but also get the full set
eileenmcnaughton
changed the title
|
@colemanw @seamuslee001 this has passed now (the big WIP pr still has fails though but not from this commit :-) |
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
Minor code cleanup (from #14782)
Before
Less readable
After
More readable, ready for further cleanup
Technical Details
Comments