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

FIX: Ensure extra classes are copied over to readonly/disabled fields

Browse Source
This commit is contained in:
Loz Calver 2021-12-16 11:52:11 +00:00
parent 465ca1d16d
commit cb37e5fb87
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Forms/FormField.php
View File

@ -1355,13 +1355,14 @@ class FormField extends RequestHandler
$field = $classOrCopy::create($this->name); $field = $classOrCopy::create($this->name);
} }
$extraClasses = $this->extraClasses ? array_values($this->extraClasses) : [];
$field $field
->setValue($this->value) ->setValue($this->value)
->setForm($this->form) ->setForm($this->form)
->setTitle($this->Title()) ->setTitle($this->Title())
->setLeftTitle($this->LeftTitle()) ->setLeftTitle($this->LeftTitle())
->setRightTitle($this->RightTitle()) ->setRightTitle($this->RightTitle())
->addExtraClass($this->extraClass) // Don't use extraClass(), since this merges calculated values ->addExtraClass(implode(' ', $extraClasses)) // Don't use extraClass(), since this merges calculated values
->setDescription($this->getDescription()); ->setDescription($this->getDescription());
// Only include built-in attributes, ignore anything set through getAttributes(). // Only include built-in attributes, ignore anything set through getAttributes().

8
tests/php/Forms/FormFieldTest.php
View File

@ -259,6 +259,14 @@ class FormFieldTest extends SapphireTest
$this->assertStringNotContainsString('readonly="readonly"', $field->getAttributesHTML()); $this->assertStringNotContainsString('readonly="readonly"', $field->getAttributesHTML());
} }
public function testReadonlyPreservesExtraClass()
{
$field = new FormField('MyField');
$field->addExtraClass('myextraclass1')->addExtraClass('myextraclass2');
$field->setReadonly(true);
$this->assertStringContainsString('myextraclass1 myextraclass2', $field->getAttributesHTML());
}
public function testDisabled() public function testDisabled()
{ {
$field = new FormField('MyField'); $field = new FormField('MyField');

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

@ -203,7 +203,7 @@ class TreeMultiselectFieldTest extends SapphireTest
$this->assertSame('TreeDropdownField', $schemaDataDefaults['component']); $this->assertSame('TreeDropdownField', $schemaDataDefaults['component']);
$this->assertSame(sprintf('%s_Holder', $field->ID()), $schemaDataDefaults['holderId']); $this->assertSame(sprintf('%s_Holder', $field->ID()), $schemaDataDefaults['holderId']);
$this->assertSame('Test tree', $schemaDataDefaults['title']); $this->assertSame('Test tree', $schemaDataDefaults['title']);
$this->assertSame('treemultiselectfield_readonly multiple searchable', $schemaDataDefaults['extraClass']); $this->assertSame('treemultiselectfield_readonly multiple searchable', $schemaDataDefaults['extraClass']);
$this->assertSame('field/TestTree/tree', $schemaDataDefaults['data']['urlTree']); $this->assertSame('field/TestTree/tree', $schemaDataDefaults['data']['urlTree']);
$this->assertSame(true, $schemaDataDefaults['data']['showSearch']); $this->assertSame(true, $schemaDataDefaults['data']['showSearch']);
$this->assertSame('(Search or choose File)', $schemaDataDefaults['data']['emptyString']); $this->assertSame('(Search or choose File)', $schemaDataDefaults['data']['emptyString']);
@ -239,7 +239,7 @@ class TreeMultiselectFieldTest extends SapphireTest
$this->assertSame('TreeDropdownField', $schemaDataDefaults['component']); $this->assertSame('TreeDropdownField', $schemaDataDefaults['component']);
$this->assertSame(sprintf('%s_Holder', $field->ID()), $schemaDataDefaults['holderId']); $this->assertSame(sprintf('%s_Holder', $field->ID()), $schemaDataDefaults['holderId']);
$this->assertSame('Test tree', $schemaDataDefaults['title']); $this->assertSame('Test tree', $schemaDataDefaults['title']);
$this->assertSame('treemultiselectfield_readonly multiple searchable', $schemaDataDefaults['extraClass']); $this->assertSame('treemultiselectfield_readonly multiple searchable', $schemaDataDefaults['extraClass']);
$this->assertSame('field/TestTree/tree', $schemaDataDefaults['data']['urlTree']); $this->assertSame('field/TestTree/tree', $schemaDataDefaults['data']['urlTree']);
$this->assertSame(true, $schemaDataDefaults['data']['showSearch']); $this->assertSame(true, $schemaDataDefaults['data']['showSearch']);
$this->assertSame('(Search or choose File)', $schemaDataDefaults['data']['emptyString']); $this->assertSame('(Search or choose File)', $schemaDataDefaults['data']['emptyString']);