mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #7434 from open-sausages/pulls/4.0/the-tree-needs-cutting
Fix refactor TreeMultiselectField to be clearable if nothing is selected
This commit is contained in:
commit
58cd83e4f7
@ -215,38 +215,37 @@ class TreeMultiselectField extends TreeDropdownField
|
||||
*/
|
||||
public function saveInto(DataObjectInterface $record)
|
||||
{
|
||||
$items = [];
|
||||
$fieldName = $this->name;
|
||||
$saveDest = $record->$fieldName();
|
||||
|
||||
if (!$saveDest) {
|
||||
$recordClass = get_class($record);
|
||||
user_error(
|
||||
"TreeMultiselectField::saveInto() Field '$fieldName' not found on"
|
||||
. " {$recordClass}.{$record->ID}",
|
||||
E_USER_ERROR
|
||||
);
|
||||
}
|
||||
|
||||
// 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(
|
||||
"TreeMultiselectField::saveInto() Field '$fieldName' not found on"
|
||||
. " {$recordClass}.{$record->ID}",
|
||||
E_USER_ERROR
|
||||
);
|
||||
}
|
||||
|
||||
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";
|
||||
if ($record->hasMethod($funcName)) {
|
||||
$result = $record->$funcName($items);
|
||||
if (!$result) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
$saveDest->setByIDList($items);
|
||||
}
|
||||
|
||||
// Allows you to modify the items on your object before save
|
||||
$funcName = "onChange$fieldName";
|
||||
if ($record->hasMethod($funcName)) {
|
||||
$result = $record->$funcName($items);
|
||||
if (!$result) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
$saveDest->setByIDList($items);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user