Refactored out of CRM_Core_PseudoConstant: getBatchType(), getBatchStatus(). CRM...

----------------------------------------
* CRM-12464:
  http://issues.civicrm.org/jira/browse/CRM-12464

diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php
index d203cbd134e74d227ce55ee4ef14f902f7d5a30a..706e4b93f11777068e40c3354ce7ed3325b472b3 100644 (file)
--- a/CRM/Batch/BAO/Batch.php
+++ b/CRM/Batch/BAO/Batch.php
@@ -285,8 +285,8 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
       $links = self::links();
     }
 
-    $batchTypes = CRM_Core_PseudoConstant::getBatchType();
-    $batchStatus = CRM_Core_PseudoConstant::getBatchStatus();
+    $batchTypes = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'type_id');
+    $batchStatus = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'status_id');
     $paymentInstrument = CRM_Contribute_PseudoConstant::paymentInstrument();
 
     $results = array();

diff --git a/CRM/Batch/Form/Batch.php b/CRM/Batch/Form/Batch.php
index aa52c54750735cdd1b7e8765bed61889316d4194..c722d7b45f7f878da21c540628088cc76fb8fa9b 100644 (file)
--- a/CRM/Batch/Form/Batch.php
+++ b/CRM/Batch/Form/Batch.php
@@ -63,7 +63,8 @@ class CRM_Batch_Form_Batch extends CRM_Admin_Form {
     $attributes = CRM_Core_DAO::getAttribute('CRM_Batch_DAO_Batch');
     $this->add('text', 'title', ts('Batch Name'), $attributes['name'], TRUE);
 
-    $batchTypes = CRM_Core_PseudoConstant::getBatchType();
+    $batchTypes = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'type_id');
+    
     // unset non-related types
     unset($batchTypes[3]);
     unset($batchTypes[4]);

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index f4a8e4bf257d563cbc8c34478f8202318b8fb87b..a6e0a48a115ec21366459477aad45938eef31580 100644 (file)
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -287,20 +287,6 @@ class CRM_Core_PseudoConstant {
    */
   private static $batchModes;
 
-  /**
-   * batch type options
-   * @var array
-   * @static
-   */
-  private static $batchTypes;
-
-  /**
-   * batch status options
-   * @var array
-   * @static
-   */
-  private static $batchStatues;
-
   /**
    * contact Type
    * @var array
@@ -1978,42 +1964,6 @@ WHERE  id = %1
     return self::$batchModes;
   }
 
-  /**
-   * Get all batch types
-   *
-   * The static array batchTypes
-   *
-   * @access public
-   * @static
-   *
-   * @return array - array reference of all batch types
-   */
-  public static function &getBatchType() {
-    if (!self::$batchTypes) {
-      self::$batchTypes = CRM_Core_OptionGroup::values('batch_type');
-    }
-
-    return self::$batchTypes;
-  }
-
-  /**
-   * Get all batch statuses
-   *
-   * The static array batchStatues
-   *
-   * @access public
-   * @static
-   *
-   * @return array - array reference of all batch statuses
-   */
-  public static function &getBatchStatus() {
-    if (!self::$batchStatues) {
-      self::$batchStatues = CRM_Core_OptionGroup::values('batch_status');
-    }
-
-    return self::$batchStatues;
-  }
-
   /*
   * The static array contactType is returned
   *

diff --git a/tests/phpunit/CRM/Core/PseudoConstantTest.php b/tests/phpunit/CRM/Core/PseudoConstantTest.php
index feb295d87a079a6f230d44c38b0bcebad00cb308..84b1d05cc1825cb9764746ac8a8ebe5360a1e083 100644 (file)
--- a/tests/phpunit/CRM/Core/PseudoConstantTest.php
+++ b/tests/phpunit/CRM/Core/PseudoConstantTest.php
@@ -50,6 +50,16 @@ class CRM_Core_PseudoConstantTest extends CiviUnitTestCase {
     // - sample: Any one value which is expected in the list of option values.
     // - max: integer (default = 10) maximum number of option values expected.
     $fields = array(
+      'CRM_Batch_DAO_Batch' => array(
+        array(
+          'fieldName' => 'type_id',
+          'sample' => 'Membership',
+        ),
+        array(
+          'fieldName' => 'status_id',
+          'sample' => 'Reopened',
+        ),
+      ),
       'CRM_Project_DAO_Task' => array(
         array(
           'fieldName' => 'priority_id',

diff --git a/xml/schema/Batch/Batch.xml b/xml/schema/Batch/Batch.xml
index a7f5516ae6a83707e95b2978ef155160eb9e269a..11068122b07c89e9cd0a3e6e951871ca4b5b216a 100644 (file)
--- a/xml/schema/Batch/Batch.xml
+++ b/xml/schema/Batch/Batch.xml
@@ -114,12 +114,18 @@
     <required>true</required>
     <comment>fk to Batch Status options in civicrm_option_values</comment>
     <add>4.2</add>
+    <pseudoconstant>
+      <optionGroupName>batch_status</optionGroupName>
+    </pseudoconstant>
   </field>
   <field>
     <name>type_id</name>
     <type>int unsigned</type>
     <comment>fk to Batch Type options in civicrm_option_values</comment>
     <add>4.2</add>
+    <pseudoconstant>
+      <optionGroupName>batch_type</optionGroupName>
+    </pseudoconstant>
   </field>
   <field>
     <name>mode_id</name>