OptionValue - Fix checking if domain is set #22095
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
|
(Standard links)
|
|
@demeritcowboy since you merged #22089 would you take a look at this one too? I don't have an idea of how to write a test for it, but without this PR the tests in #22064 all blow up. So maybe that counts as test coverage? |
Fixes a bug introduced in civicrm#19970
colemanw
force-pushed
the
fixDomainOptionGroup
branch
from
b1a6388 to
6651b27
Compare
|
@demeritcowboy - actually I managed to add test coverage to this PR - the lines I added trigger the bug and will cause the test to fail without this patch. |
| @@ -192,7 +193,7 @@ public static function add(&$params, $ids = []) { | |||
| $p = [1 => [$params['option_group_id'], 'Integer']]; | |||
|
|
|||
| // Limit update by domain of option | |||
| $domain = $optionValue->domain_id ?? NULL; | |||
| $domain = CRM_Utils_System::isNull($optionValue->domain_id) ? NULL : $optionValue->domain_id; | |||
There was a problem hiding this comment.
I was confused at first thinking this would give an error in the typical situation, where $optionValue->domain_id never gets set and so attempting to reference a non-existent thing, but it's declared as a property in the DAO so works ok. So the previous ?? wasn't really necessary.
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
Fixes a bug introduced in #19970 when saving an option value related to a domain
Before
This was causing test failures in #22064
After
Fixed
Technical Details
Similar to the problem in #22089 we need to use
CRM_Utils_System::isNull()because the API will pass the string 'null' into BAO functions like this one.