From 5b721e81df03a30b0fcd69f0db83ce0c6de72acd Mon Sep 17 00:00:00 2001 From: "Matthew Wire (MJW Consulting)" Date: Tue, 15 Jan 2019 11:18:30 +0000 Subject: [PATCH] Convert deprecated OptionGroup::getLabel to PseudoConstant::getLabel for case --- CRM/Case/Form/Activity.php | 2 +- CRM/Case/Form/Activity/ChangeCaseStatus.php | 1 + CRM/Case/XMLProcessor/Report.php | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CRM/Case/Form/Activity.php b/CRM/Case/Form/Activity.php index a1f6809ec3b5..e8bf93717539 100644 --- a/CRM/Case/Form/Activity.php +++ b/CRM/Case/Form/Activity.php @@ -279,7 +279,7 @@ public function buildQuickForm() { // Is that really a big problem? $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); + $encounterMediums[$this->_encounterMedium] = CRM_Core_PseudoConstant::getLabel('CRM_Activity_BAO_Activity', 'encounter_medium', $this->_encounterMedium); } } diff --git a/CRM/Case/Form/Activity/ChangeCaseStatus.php b/CRM/Case/Form/Activity/ChangeCaseStatus.php index f7446aee0c57..7cc54f3b9580 100644 --- a/CRM/Case/Form/Activity/ChangeCaseStatus.php +++ b/CRM/Case/Form/Activity/ChangeCaseStatus.php @@ -109,6 +109,7 @@ public static function buildQuickForm(&$form) { $valdefault, FALSE ); + $form->_caseStatus[$valdefault] = CRM_Core_PseudoConstant::getLabel('CRM_Case_BAO_Case', 'case_status', $valdefault); } } $element = $form->add('select', 'case_status_id', ts('Case Status'), diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php index 44e998990c5f..2a7e58e86c61 100644 --- a/CRM/Case/XMLProcessor/Report.php +++ b/CRM/Case/XMLProcessor/Report.php @@ -142,7 +142,7 @@ public function &caseInfo( $case['caseType'] = CRM_Case_BAO_Case::getCaseType($caseID); $case['caseTypeName'] = CRM_Case_BAO_Case::getCaseType($caseID, 'name'); - $case['status'] = CRM_Core_OptionGroup::getLabel('case_status', $dao->status_id, FALSE); + $case['status'] = CRM_Core_PseudoConstant::getLabel('CRM_Case_BAO_Case', 'case_status', $dao->status_id); } return $case; } @@ -477,9 +477,7 @@ public function &getActivity($clientID, $activityDAO, &$activityTypeInfo) { if ($activityDAO->medium_id) { $activity['fields'][] = array( 'label' => ts('Medium'), - 'value' => CRM_Core_OptionGroup::getLabel('encounter_medium', - $activityDAO->medium_id, FALSE - ), + 'value' => CRM_Core_PseudoConstant::getLabel('CRM_Activity_BAO_Activity', 'encounter_medium', $activityDAO->medium_id), 'type' => 'String', ); }