Merge pull request #12718 from mattwire/custom_field_optiongroup_fix

Fix for issue editing custom fields with option groups after #12423
civicrm · Aug 24, 2018 · 5bc1d29 · 5bc1d29
2 parents 19ea6c0 + f46ffe8
commit 5bc1d29
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/CRM/Custom/Form/Field.php b/CRM/Custom/Form/Field.php
@@ -319,15 +319,21 @@ public function buildQuickForm() {
       $this->freeze('data_type');
     }
 
-    $optionGroupParams = [
-      'is_reserved' => 0,
-      'is_active' => 1,
-      'options' => ['limit' => 0, 'sort' => "title ASC"],
-      'return' => ['title'],
-    ];
     if ($this->_action == CRM_Core_Action::UPDATE) {
-      $optionGroupParams['id'] = $this->_values['id'];
+      $optionGroupParams = [
+        'id' => $this->_values['option_group_id'],
+        'return' => ['title'],
+      ];
     }
+    else {
+      $optionGroupParams = [
+        'is_reserved' => 0,
+        'is_active' => 1,
+        'options' => ['limit' => 0, 'sort' => "title ASC"],
+        'return' => ['title'],
+      ];
+    }
+
     // Get all custom (is_reserved=0) option groups
     $optionGroupMetadata = civicrm_api3('OptionGroup', 'get', $optionGroupParams);