From 1d4e5453d88cf7a1eec89bfd85819023ea2d72b3 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 21 Jul 2016 10:07:20 +1000
Subject: [PATCH] Fix up OptionGroup Form

---
 CRM/Admin/Form/OptionGroup.php           | 2 +-
 CRM/Admin/Form/Options.php               | 4 ++--
 templates/CRM/Admin/Form/OptionGroup.tpl | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CRM/Admin/Form/OptionGroup.php b/CRM/Admin/Form/OptionGroup.php
index 7fbe798178..9ef3380259 100644
--- a/CRM/Admin/Form/OptionGroup.php
+++ b/CRM/Admin/Form/OptionGroup.php
@@ -78,7 +78,7 @@ class CRM_Admin_Form_OptionGroup extends CRM_Admin_Form {
       CRM_Core_DAO::getAttribute('CRM_Core_DAO_OptionGroup', 'description')
     );
 
-    $this->addSelect('Data Type', CRM_Utils_Type::dataTypes(), TRUE);
+    $this->addSelect('data_type', array('options' => CRM_Utils_Type::dataTypes()), TRUE);
 
     $element = $this->add('checkbox', 'is_active', ts('Enabled?'));
     if ($this->_action & CRM_Core_Action::UPDATE) {
diff --git a/CRM/Admin/Form/Options.php b/CRM/Admin/Form/Options.php
index 3ff8e98ec3..41d149be92 100644
--- a/CRM/Admin/Form/Options.php
+++ b/CRM/Admin/Form/Options.php
@@ -391,9 +391,9 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
   /**
    * Get the DataType for a specified Option Group.
    *
-   * @param string $optionGroupname name of the option group
+   * @param string $optionGroupName name of the option group
    *
-   * @return string|bool
+   * @return string|null
    */
   public static function getOptionGroupDataType($optionGroupName) {
     $optionGroup = civicrm_api3('OptionGroup', 'get', array(
diff --git a/templates/CRM/Admin/Form/OptionGroup.tpl b/templates/CRM/Admin/Form/OptionGroup.tpl
index c9db7e198a..d9c5588dd1 100644
--- a/templates/CRM/Admin/Form/OptionGroup.tpl
+++ b/templates/CRM/Admin/Form/OptionGroup.tpl
@@ -44,6 +44,10 @@
           </tr>
         <td class="label">{$form.name.label}</td>
               <td>{$form.name.html}</td></tr>
+          <tr class="crm-admin-optiongroup-form-block-data-type">
+            <td class="label">{$form.data_type.label}</td>
+            <td>{$form.data_type.html}</td>
+          </tr>
           <tr class="crm-admin-optiongroup-form-block-is_active">
               <td class="label">{$form.is_active.label}</td>
               <td>{$form.is_active.html}</td>
-- 
2.25.1