CRM-17646 - Ensure user-facing case type options go through hook_fieldOptions

[civicrm-core.git] / CRM / Case / Form / Case.php

diff --git a/CRM/Case/Form/Case.php b/CRM/Case/Form/Case.php
index 6d54dbae270d63c3e44f0fb79df27df8f8382589..cb886e30289d229969ae268fb1aa9e9f8a1adfb4 100644 (file)
--- a/CRM/Case/Form/Case.php
+++ b/CRM/Case/Form/Case.php
@@ -111,17 +111,14 @@ class CRM_Case_Form_Case extends CRM_Core_Form {
 
     if (!$this->_caseId) {
       $caseAttributes = array(
-        'case_type' => CRM_Case_PseudoConstant::caseType(),
-        'case_status' => CRM_Case_PseudoConstant::caseStatus(),
-        'encounter_medium' => CRM_Case_PseudoConstant::encounterMedium(),
+        'case_type_id' => ts('Case Type'),
+        'status_id' => ts('Case Status'),
+        'medium_id' => ts('Activity Medium'),
       );
 
-      foreach ($caseAttributes as $key => $values) {
-        if (empty($values)) {
-          CRM_Core_Error::fatal(ts('You do not have any active %1',
-            array(1 => str_replace('_', ' ', $key))
-          ));
-          break;
+      foreach ($caseAttributes as $key => $label) {
+        if (!CRM_Case_BAO_Case::buildOptions($key, 'create')) {
+          CRM_Core_Error::fatal(ts('You do not have any active %1', array(1 => $label)));
         }
       }
     }