Merge branch '3' into 4

silverstripe · Oct 11, 2024 · 656598a · 656598a
2 parents 5f7fb88 + 63cfb0d
commit 656598a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/ReadonlyTagField.php b/src/ReadonlyTagField.php
@@ -27,7 +27,8 @@ public function Field($properties = array())
     {
         $options = array();
 
-        foreach ($this->getOptions()->filter('Selected', true) as $option) {
+        // only get the selected options
+        foreach ($this->getOptions(true) as $option) {
             $options[] = $option->Title;
         }
 

diff --git a/tests/TagFieldTest.php b/tests/TagFieldTest.php
@@ -408,6 +408,22 @@ public function testReadonlyTransformation()
         $field->setTitleField('Name');
         $readOnlyField = $field->performReadonlyTransformation();
         $this->assertEquals('Name', $readOnlyField->getTitleField());
+
+        // Also check Field options
+        $field = new TagField('Tags', '', TagFieldTestBlogTag::get());
+        $field->setTitleField('Title');
+        $field->setValue(['Tag1']);
+
+        // When not read only (and not lazy-loading) all source options are returned
+        $htmlText = $field->Field();
+        $this->assertStringContainsString('Tag1', $htmlText);
+        $this->assertStringContainsString('222', $htmlText);
+
+        // When read only mode, only selected options are returned
+        $readOnlyField = $field->performReadonlyTransformation();
+        $htmlText = $readOnlyField->Field();
+        $this->assertStringContainsString('Tag1', $htmlText);
+        $this->assertStringNotContainsString('222', $htmlText);
     }
 
     public function testItDisplaysWithSelectedValuesFromDataList()