tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8689 from jinjie/fix-checkbox-disabled-items

Browse Source 
Fix for CheckboxSetField not disabling items correctly
This commit is contained in:
Robbie Averill 2019-01-07 09:25:34 +00:00 committed by GitHub
commit 7cb8256fa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Forms/CheckboxSetField.php
View File

@ -72,6 +72,7 @@ class CheckboxSetField extends MultiSelectField
{ {
$selectedValues = $this->getValueArray(); $selectedValues = $this->getValueArray();
$defaultItems = $this->getDefaultItems(); $defaultItems = $this->getDefaultItems();
$disabledItems = $this->getDisabledItems();
// Generate list of options to display // Generate list of options to display
$odd = false; $odd = false;
@ -84,7 +85,7 @@ class CheckboxSetField extends MultiSelectField
$extraClass .= ' val' . preg_replace('/[^a-zA-Z0-9\-\_]/', '_', $itemValue); $extraClass .= ' val' . preg_replace('/[^a-zA-Z0-9\-\_]/', '_', $itemValue);
$itemChecked = in_array($itemValue, $selectedValues) || in_array($itemValue, $defaultItems); $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( $options->push(new ArrayData(array(
'ID' => $itemID, 'ID' => $itemID,