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

BUG Fix PostgreSQL issue in TreeMultiselectField where field would try to filter list by a blank ID

Browse Source
This commit is contained in:
Maxime Rainville 2021-01-20 12:23:09 +13:00
parent 76ae5bc38a
commit 17c6f98ba2
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Forms/TreeMultiselectField.php
View File

@ -149,12 +149,16 @@ class TreeMultiselectField extends TreeDropdownField
// Parse ids from value string / array // Parse ids from value string / array
$ids = []; $ids = [];
if (is_string($value)) { if (is_string($value)) {
$ids = preg_split("#\s*,\s*#", trim($value)); $ids = preg_split("#\s*,\s*#", trim($value));
} elseif (is_array($value)) { } elseif (is_array($value)) {
$ids = array_values($value); $ids = array_values($value);
} }
// Filter out empty strings
$ids = array_filter($ids);
// No value // No value
if (empty($ids)) { if (empty($ids)) {
return ArrayList::create(); return ArrayList::create();

7
tests/php/Forms/TreeMultiselectFieldTest.php
View File

@ -340,5 +340,12 @@ class TreeMultiselectFieldTest extends SapphireTest
[], [],
$field->getItems() $field->getItems()
); );
// Andle empty string none value
$field->setValue('');
$this->assertListEquals(
[],
$field->getItems()
);
} }
} }