BUG Fix PostgreSQL issue in TreeMultiselectField where field would tr…

…y to filter list by a blank ID
silverstripe · Jan 19, 2021 · 17c6f98 · 17c6f98
1 parent 76ae5bc
commit 17c6f98
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/Forms/TreeMultiselectField.php b/src/Forms/TreeMultiselectField.php
@@ -149,12 +149,16 @@ public function getItems()
 
         // Parse ids from value string / array
         $ids = [];
+
         if (is_string($value)) {
             $ids = preg_split("#\s*,\s*#", trim($value));
         } elseif (is_array($value)) {
             $ids = array_values($value);
         }
 
+        // Filter out empty strings
+        $ids = array_filter($ids);
+
         // No value
         if (empty($ids)) {
             return ArrayList::create();

diff --git a/tests/php/Forms/TreeMultiselectFieldTest.php b/tests/php/Forms/TreeMultiselectFieldTest.php
@@ -340,5 +340,12 @@ function ($folder) {
             [],
             $field->getItems()
         );
+
+        // Andle empty string none value
+        $field->setValue('');
+        $this->assertListEquals(
+            [],
+            $field->getItems()
+        );
     }
 }