From 1667af8f5e987609bb974882d771d0bd10e45fd0 Mon Sep 17 00:00:00 2001 From: Kong Jin Jie Date: Mon, 31 Dec 2018 17:25:11 +0800 Subject: [PATCH] Add $disabledItems to check for disabled items instead of checking against $defaultItems Fixes #8688 --- src/Forms/CheckboxSetField.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Forms/CheckboxSetField.php b/src/Forms/CheckboxSetField.php index 764e3659e..1d8f94709 100644 --- a/src/Forms/CheckboxSetField.php +++ b/src/Forms/CheckboxSetField.php @@ -72,6 +72,7 @@ class CheckboxSetField extends MultiSelectField { $selectedValues = $this->getValueArray(); $defaultItems = $this->getDefaultItems(); + $disabledItems = $this->getDisabledItems(); // Generate list of options to display $odd = false; @@ -84,7 +85,7 @@ class CheckboxSetField extends MultiSelectField $extraClass .= ' val' . preg_replace('/[^a-zA-Z0-9\-\_]/', '_', $itemValue); $itemChecked = in_array($itemValue, $selectedValues) || in_array($itemValue, $defaultItems); - $itemDisabled = $this->isDisabled() || in_array($itemValue, $defaultItems); + $itemDisabled = $this->isDisabled() || in_array($itemValue, $disabledItems); $options->push(new ArrayData(array( 'ID' => $itemID,