From 04b4834eeecfc8b79407add5b9891c36ef503046 Mon Sep 17 00:00:00 2001
From: kurund <kurund@civicrm.org>
Date: Thu, 13 Mar 2014 16:03:41 +0530
Subject: [PATCH] test fixes related to enum to varchar changes

---
 CRM/Core/SelectValues.php       | 36 ++++++++-------------------------
 xml/schema/Core/CustomField.xml |  2 +-
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php
index 089fd4163f..a84818b9fb 100644
--- a/CRM/Core/SelectValues.php
+++ b/CRM/Core/SelectValues.php
@@ -185,30 +185,6 @@ class CRM_Core_SelectValues {
     return $eventDate;
   }
 
-  /**
-   * Extended property (custom field) data types
-   * @static
-   */
-  static function &customDataType() {
-    static $customDataType = NULL;
-    if (!$customDataType) {
-      $customDataType = array(
-        '' => ts('- select -'),
-        'String' => ts('Text'),
-        'Int' => ts('Integer'),
-        'Float' => ts('Decimal Number'),
-        'Money' => ts('Money'),
-        'Text' => ts('Memo'),
-        'Date' => ts('Date'),
-        'File' => ts('File'),
-        'Boolean' => ts('Yes/No'),
-        'Link' => ts('Link'),
-        'Auto-complete' => ts('Auto-complete'),
-      );
-    }
-    return $customDataType;
-  }
-
   /**
    * Custom form field types
    * @static
@@ -223,12 +199,16 @@ class CRM_Core_SelectValues {
         'Select' => ts('Drop-down (select list)'),
         'Radio' => ts('Radio buttons'),
         'Checkbox' => ts('Checkbox(es)'),
-        'Select Date' => ts('Date selector'),
+        'Date' => ts('Select Date'),
         'File' => ts('File'),
-        'Select State / Province' => ts('State / Province selector'),
-        'Select Country' => ts('Country selector'),
+        'StateProvince' => ts('Select State/Province'),
+        'Country' => ts('Select Country'),
         'RichTextEditor' => ts('Rich Text Editor'),
-        'Auto-complete' => ts('Contact Reference'),
+        'Autocomplete-Select' => ts('Autocomplete-Select'),
+        'Multi-Select' => ts('Multi-Select'),
+        'AdvMulti-Select' => ts('AdvMulti-Select'),
+        'Link' => ts('Link'),
+        'ContactReference' => ts('Autocomplete Select'),
       );
     }
     return $customHtmlType;
diff --git a/xml/schema/Core/CustomField.xml b/xml/schema/Core/CustomField.xml
index 8b2a5fbd59..1064d58ffb 100644
--- a/xml/schema/Core/CustomField.xml
+++ b/xml/schema/Core/CustomField.xml
@@ -77,7 +77,7 @@
      <required>true</required>
      <comment>HTML types plus several built-in extended types.</comment>
      <pseudoconstant>
-       <callback>CRM_Core_BAO_CustomField::dataToHtml</callback>
+       <callback>CRM_Core_SelectValues::customHtmlType</callback>
      </pseudoconstant>
      <add>1.1</add>
   </field>
-- 
2.25.1