Merge pull request #310 from silverstripeltd/bugfix/read-only-mode-fix

ENH Refactor the way selected options are returned for read only tag fields

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;
         }
 

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()