From 7407096e997b6178c5ccbedc8010dad7ec3e9b06 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 27 May 2019 12:35:00 +1200
Subject: [PATCH] FIX: List default items in the readonly view of ListboxField

Adds tests for non-readonly default items too.

Fixes #4142
---
 src/Forms/MultiSelectField.php           |  5 ++++
 tests/php/Forms/ListboxFieldTest.php     | 34 ++++++++++++++++++++++++
 tests/php/Forms/ListboxFieldTest/Tag.php |  4 +++
 3 files changed, 43 insertions(+)

diff --git a/src/Forms/MultiSelectField.php b/src/Forms/MultiSelectField.php
index f87b4b023..0d9d82fb1 100644
--- a/src/Forms/MultiSelectField.php
+++ b/src/Forms/MultiSelectField.php
@@ -276,6 +276,11 @@ abstract class MultiSelectField extends SelectField
         $field->setSource($this->getSource());
         $field->setReadonly(true);
 
+        // Pass through default items
+        if (!$this->getValueArray() && $this->getDefaultItems()) {
+            $field->setValue($this->getDefaultItems());
+        }
+
         return $field;
     }
 }
diff --git a/tests/php/Forms/ListboxFieldTest.php b/tests/php/Forms/ListboxFieldTest.php
index a674999a0..f6865e4ef 100644
--- a/tests/php/Forms/ListboxFieldTest.php
+++ b/tests/php/Forms/ListboxFieldTest.php
@@ -251,4 +251,38 @@ class ListboxFieldTest extends SapphireTest
             'Does not validate values not within source map'
         );
     }
+
+    public function testFieldWithDefaultItems()
+    {
+        $articleWithTags = $this->objFromFixture(Article::class, 'articlewithtags');
+        $tag1 = $this->objFromFixture(Tag::class, 'tag1');
+        $tag2 = $this->objFromFixture(Tag::class, 'tag2');
+        $tag3 = $this->objFromFixture(Tag::class, 'tag3');
+        $field = new ListboxField("Tags", "Test field", DataObject::get(Tag::class)->map()->toArray());
+        $field->setDefaultItems([$tag1->ID, $tag2->ID]);
+
+
+        $field->setValue(null, $articleWithTags);
+        $field->setDisabledItems(array($tag1->ID, $tag3->ID));
+
+        // Confirm that tag1 and tag2 are selected
+        $p = new CSSContentParser($field->Field());
+        $tag1xml = $p->getByXpath('//option[@value=' . $tag1->ID . ']');
+        $tag2xml = $p->getByXpath('//option[@value=' . $tag2->ID . ']');
+        $tag3xml = $p->getByXpath('//option[@value=' . $tag3->ID . ']');
+        $this->assertEquals('selected', (string)$tag1xml[0]['selected']);
+        $this->assertEquals('selected', (string)$tag2xml[0]['selected']);
+        $this->assertNull($tag3xml[0]['selected']);
+
+        // Confirm that tag1 and tag2 are listed in the readonly variation
+        $p = new CSSContentParser($field->performReadonlyTransformation()->Field());
+        $this->assertEquals(
+            'Tag 1, Tag 2',
+            trim(preg_replace('/\s+/', ' ', $p->getByXpath('//span')[0]))
+        );
+        $this->assertEquals(
+            '1, 2',
+            '' . $p->getByXpath('//input')[0]['value']
+        );
+    }
 }
diff --git a/tests/php/Forms/ListboxFieldTest/Tag.php b/tests/php/Forms/ListboxFieldTest/Tag.php
index 90be72f22..b8e8fc396 100644
--- a/tests/php/Forms/ListboxFieldTest/Tag.php
+++ b/tests/php/Forms/ListboxFieldTest/Tag.php
@@ -12,4 +12,8 @@ class Tag extends DataObject implements TestOnly
     private static $belongs_many_many = array(
         'Articles' => Article::class
     );
+
+    private static $db = [
+        'Title' => 'Varchar',
+    ];
 }