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 #7434 from open-sausages/pulls/4.0/the-tree-needs-cutting

Browse Source 
Fix refactor TreeMultiselectField to be clearable if nothing is selected
This commit is contained in:
Chris Joe 2017-10-06 15:16:10 +13:00 committed by GitHub
commit 58cd83e4f7
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Forms/TreeMultiselectField.php
View File

@ -215,12 +215,10 @@ class TreeMultiselectField extends TreeDropdownField
*/
public function saveInto(DataObjectInterface $record)
{
// Detect whether this field has actually been updated
if ($this->value !== 'unchanged') {
$items = [];
$fieldName = $this->name;
$saveDest = $record->$fieldName();
if (!$saveDest) {
$recordClass = get_class($record);
user_error(
@ -230,11 +228,14 @@ class TreeMultiselectField extends TreeDropdownField
);
}
// Detect whether this field has actually been updated
if ($this->value !== 'unchanged') {
if (is_array($this->value)) {
$items = $this->value;
} elseif ($this->value) {
$items = preg_split("/ *, */", trim($this->value));
}
}
// Allows you to modify the items on your object before save
$funcName = "onChange$fieldName";
@ -244,10 +245,8 @@ class TreeMultiselectField extends TreeDropdownField
return;
}
}
$saveDest->setByIDList($items);
}
}
/**
* Changes this field to the readonly field.