Merge pull request #23751 from eileenmcnaughton/test_member

[civicrm-core.git] / CRM / Admin / Form / Options.php

diff --git a/CRM/Admin/Form/Options.php b/CRM/Admin/Form/Options.php
index b5002a575e0add14c94d204104cd3c92ecf1d71f..ab4cbedc2fd55231ef2ee6d9ab8587711778a6da 100644 (file)
--- a/CRM/Admin/Form/Options.php
+++ b/CRM/Admin/Form/Options.php
@@ -113,7 +113,7 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
     // Default weight & value
     $fieldValues = ['option_group_id' => $this->_gid];
     foreach (['weight', 'value'] as $field) {
-      if (empty($defaults[$field])) {
+      if (!isset($defaults[$field]) || $defaults[$field] === '') {
         $defaults[$field] = CRM_Utils_Weight::getDefaultWeight('CRM_Core_DAO_OptionValue', $fieldValues, $field);
       }
     }
@@ -147,6 +147,10 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
       return;
     }
 
+    $optionGroup = \Civi\Api4\OptionGroup::get(FALSE)
+      ->addWhere('id', '=', $this->_gid)
+      ->execute()->first();
+
     $this->applyFilter('__ALL__', 'trim');
 
     $isReserved = FALSE;
@@ -174,11 +178,12 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
         ['CRM_Core_DAO_OptionValue', $this->_id, $this->_gid, 'value', $this->_domainSpecific]
       );
     }
-    else {
+
+    // Add icon & color if this option group supports it.
+    if ($optionGroup['option_value_fields'] && in_array('icon', $optionGroup['option_value_fields'])) {
       $this->add('text', 'icon', ts('Icon'), ['class' => 'crm-icon-picker', 'title' => ts('Choose Icon'), 'allowClear' => TRUE]);
     }
-
-    if (in_array($this->_gName, ['activity_status', 'case_status'])) {
+    if ($optionGroup['option_value_fields'] && in_array('color', $optionGroup['option_value_fields'])) {
       $this->add('color', 'color', ts('Color'));
     }