projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 94c7421)
Re-add case_type pseudoconstant to schema
authorColeman Watts <coleman@civicrm.org>
Sat, 2 Aug 2014 16:59:39 +0000 (17:59 +0100)
committerColeman Watts <coleman@civicrm.org>
Sat, 2 Aug 2014 16:59:39 +0000 (17:59 +0100)
tests/phpunit/CRM/Core/PseudoConstantTest.php patch | blob | blame | history
xml/schema/Case/Case.xml patch | blob | blame | history

diff --git a/tests/phpunit/CRM/Core/PseudoConstantTest.php b/tests/phpunit/CRM/Core/PseudoConstantTest.php
index fd72fb4f5d426021498379f457dcd4ec29a73bfe..027b0b69ea382a27f53909a0684b96442b151e79 100644 (file)
--- a/tests/phpunit/CRM/Core/PseudoConstantTest.php
+++ b/tests/phpunit/CRM/Core/PseudoConstantTest.php
@@ -44,6 +44,10 @@ class CRM_Core_PseudoConstantTest extends CiviUnitTestCase {
 
   function setUp() {
     parent::setUp();
+
+    $this->loadAllFixtures();
+
+    CRM_Core_BAO_ConfigSetting::enableComponent('CiviCase');
   }
 
   /**
@@ -159,7 +163,7 @@ class CRM_Core_PseudoConstantTest extends CiviUnitTestCase {
         array(
           'fieldName' => 'activity_type_id',
           'sample' => 'Email',
-          'max' => 50,
+          'max' => 100,
         ),
         array(
           'fieldName' => 'status_id',
@@ -189,7 +193,7 @@ class CRM_Core_PseudoConstantTest extends CiviUnitTestCase {
         array(
           'fieldName' => 'activity_type_id',
           'sample' => 'Phone Call',
-          'max' => 50,
+          'max' => 100,
         ),
       ),
       'CRM_Event_DAO_ParticipantStatusType' => array(
@@ -551,6 +555,10 @@ class CRM_Core_PseudoConstantTest extends CiviUnitTestCase {
           'fieldName' => 'status_id',
           'sample' => 'Ongoing',
         ),
+        array(
+          'fieldName' => 'case_type_id',
+          'sample' => 'Housing Support',
+        ),
       ),
     );
 
diff --git a/xml/schema/Case/Case.xml b/xml/schema/Case/Case.xml
index 53867e4a1b069eb14e23c3423081c246be073ffb..77b565673d87bc904180c05ab70ee4c42ffabb28 100644 (file)
--- a/xml/schema/Case/Case.xml
+++ b/xml/schema/Case/Case.xml
@@ -47,6 +47,11 @@
        <html>
          <type>Select</type>
        </html>
+       <pseudoconstant>
+         <table>civicrm_case_type</table>
+         <keyColumn>id</keyColumn>
+         <labelColumn>title</labelColumn>
+       </pseudoconstant>
        <add>2.0</add>
   </field>
   <index>