Convert deprecated OptionGroup::getLabel to PseudoConstant::getLabel …

…for case
civicrm · Jan 20, 2019 · 5b721e8 · 5b721e8
1 parent d0fe005
commit 5b721e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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',
       );
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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'),
@@ Expand Down @@