Ensure that Relative key is not added for non Select Date is_search_range custom fields #15977
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
|
(Standard links)
|
seamuslee001
force-pushed
the
fix_issue_number_range_smart_group_empty_values
branch
from
49b889e to
f842c42
Compare
CRM/Contact/BAO/SavedSearch.php
Outdated
| // fields with 'from' or 'to' values are displayed when the are set in the smart group | ||
| // being loaded. (CRM-17116) | ||
| // We should only set the relative key for custom date fields if it is not already set in the array. | ||
| if (substr($element, 0, 7) == 'custom_' && CRM_Contact_BAO_Query::isCustomDateField($element)) { |
There was a problem hiding this comment.
Is this right - ie we don't need to strip _from & _to from $element before passing to isCustomDateField?
There was a problem hiding this comment.
Yep you were right have fixed up
|
I think the rc makes sense |
Ensure that we strip the _to _from _high _low from the element name first
seamuslee001
force-pushed
the
fix_issue_number_range_smart_group_empty_values
branch
from
f842c42 to
c0b26fc
Compare
|
ok @eileenmcnaughton have put it against the RC and also expanded the unit test to verify for the select date that the function adds in the appropriate relative key as it isn't in the form values (odd ball case) so i think we are good now |
eileenmcnaughton
deleted the
fix_issue_number_range_smart_group_empty_values
branch
|
@seamuslee001 the way @jtwyman described the impact of this it might be a candidate for a point release? |
This was referenced Nov 29, 2019
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.
…ate range search
Overview
the relative key is only useful for Select Dates not any other is_search_range. Dates also used to be _to and _from but that has been changed
Before
Incorrectly adds in the relative key
After
Only adds relative key if still in old format for some reason and its a date custom field
ping @eileenmcnaughton let me know if you think this should be against the RC