Convert deprecated OptionGroup::getLabel to PseudoConstant::getLabel for cases #13460
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)
|
colemanw
reviewed
Jan 20, 2019
5b721e8 to
6283dd6
Compare
colemanw
requested changes
Jan 21, 2019
colemanw
reviewed
Jan 21, 2019
colemanw
reviewed
Jan 21, 2019
|
@colemanw I think they both work but I agree your suggestions are more consistent with what would be expected. I'll re-test in the next couple of days. |
|
Ok @mattwire I'm adding WIP to the title until you're ready. |
6283dd6 to
cedb74c
Compare
mattwire
commented
Jan 25, 2019
| @@ -726,7 +726,7 @@ public static function getCases($allCases = TRUE, $params = array(), $context = | |||
| ); | |||
| } | |||
| } | |||
| if (self::checkPermission($actId, 'edit', $case['activity_type_id'], $userID)) { | |||
| if (isset($case['activity_type_id']) && self::checkPermission($actId, 'edit', $case['activity_type_id'], $userID)) { | |||
There was a problem hiding this comment.
This resolves a php notice
mattwire
commented
Jan 25, 2019
| $this->_encounterMedium = CRM_Core_DAO::getFieldValue('CRM_Activity_DAO_Activity', $this->_activityId, 'medium_id'); | ||
| if (!array_key_exists($this->_encounterMedium, $encounterMediums)) { | ||
| $encounterMediums[$this->_encounterMedium] = CRM_Core_OptionGroup::getLabel('encounter_medium', $this->_encounterMedium, FALSE); | ||
| if ($this->_activityId) { |
There was a problem hiding this comment.
And another php notice
mattwire
commented
Jan 25, 2019
| $caseTypeIDs = explode(CRM_Core_DAO::VALUE_SEPARATOR, | ||
| $dao->case_type_id | ||
| ); | ||
|
|
There was a problem hiding this comment.
$caseTypeID and $caseTypeIDs are never used...
|
@colemanw you were correct... all now updated and tested. |
colemanw
approved these changes
Jan 25, 2019
|
I've just tested it as well. Works great. |
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
Convert a deprecated function for cases
Before
Uses the deprecated
CRM_Core_OptionGroup::getLabelfunction which logs a deprecated warning.After
Use the replacement
CRM_Core_PseudoConstant::getLabelfunction.Technical Details
Default context for getLabel is "get" which means we get translated labels and disabled values. So it matches previous behaviour.
Comments