From 8af5ff93c399e956d65486c85c6de8560d7c32d0 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <ryan.a.ohara@gmail.com>
Date: Mon, 28 Nov 2016 16:26:27 +1300
Subject: [PATCH] Make sure option gridfield is created before the
 UpdateCMSFields function so we can override fields in extensions

---
 .../EditableMultipleOptionField.php           | 80 ++++++++++---------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/code/model/editableformfields/EditableMultipleOptionField.php b/code/model/editableformfields/EditableMultipleOptionField.php
index fb966a9..c16a36e 100644
--- a/code/model/editableformfields/EditableMultipleOptionField.php
+++ b/code/model/editableformfields/EditableMultipleOptionField.php
@@ -33,50 +33,52 @@ class EditableMultipleOptionField extends EditableFormField
      */
     public function getCMSFields()
     {
-        $fields = parent::getCMSFields();
+        $this->beforeUpdateCMSFields(function($fields) {
+            $editableColumns = new GridFieldEditableColumns();
+            $editableColumns->setDisplayFields(array(
+                'Title' => array(
+                    'title' => _t('EditableMultipleOptionField.TITLE', 'Title'),
+                    'callback' => function ($record, $column, $grid) {
+                        return TextField::create($column);
+                    }
+                ),
+                'Value' => array(
+                    'title' => _t('EditableMultipleOptionField.VALUE', 'Value'),
+                    'callback' => function ($record, $column, $grid) {
+                        return TextField::create($column);
+                    }
+                ),
+                'Default' => array(
+                    'title' => _t('EditableMultipleOptionField.DEFAULT', 'Selected by default?'),
+                    'callback' => function ($record, $column, $grid) {
+                        return CheckboxField::create($column);
+                    }
+                )
+            ));
 
-        $editableColumns = new GridFieldEditableColumns();
-        $editableColumns->setDisplayFields(array(
-            'Title' => array(
-                'title' => _t('EditableMultipleOptionField.TITLE', 'Title'),
-                'callback' => function ($record, $column, $grid) {
-                    return TextField::create($column);
-                }
-            ),
-            'Value' => array(
-                'title' => _t('EditableMultipleOptionField.VALUE', 'Value'),
-                'callback' => function ($record, $column, $grid) {
-                    return TextField::create($column);
-                }
-            ),
-            'Default' => array(
-                'title' => _t('EditableMultipleOptionField.DEFAULT', 'Selected by default?'),
-                'callback' => function ($record, $column, $grid) {
-                    return CheckboxField::create($column);
-                }
-            )
-        ));
+            $optionsConfig = GridFieldConfig::create()
+                ->addComponents(
+                    new GridFieldToolbarHeader(),
+                    new GridFieldTitleHeader(),
+                    new GridFieldOrderableRows('Sort'),
+                    $editableColumns,
+                    new GridFieldButtonRow(),
+                    new GridFieldAddNewInlineButton(),
+                    new GridFieldDeleteAction()
+                );
 
-        $optionsConfig = GridFieldConfig::create()
-            ->addComponents(
-                new GridFieldToolbarHeader(),
-                new GridFieldTitleHeader(),
-                new GridFieldOrderableRows('Sort'),
-                $editableColumns,
-                new GridFieldButtonRow(),
-                new GridFieldAddNewInlineButton(),
-                new GridFieldDeleteAction()
+            $optionsGrid = GridField::create(
+                'Options',
+                _t('EditableFormField.CUSTOMOPTIONS', 'Options'),
+                $this->Options(),
+                $optionsConfig
             );
 
-        $optionsGrid = GridField::create(
-            'Options',
-            _t('EditableFormField.CUSTOMOPTIONS', 'Options'),
-            $this->Options(),
-            $optionsConfig
-        );
+            $fields->insertAfter(new Tab('Options', _t('EditableMultipleOptionField.OPTIONSTAB', 'Options')), 'Main');
+            $fields->addFieldToTab('Root.Options', $optionsGrid);
+        });
 
-        $fields->insertAfter(new Tab('Options', _t('EditableMultipleOptionField.OPTIONSTAB', 'Options')), 'Main');
-        $fields->addFieldToTab('Root.Options', $optionsGrid);
+        $fields = parent::getCMSFields();
 
         return $fields;
     }