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

Move hasEmptySchem and emptyString to DataSchema on SingleSelectField

Browse Source
This commit is contained in:
Brett Tasker 2021-03-23 20:08:37 +13:00
parent 47855e3e49
commit 600f8e5b86
2 changed files with 103 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Forms/SingleSelectField.php
View File

@ -34,12 +34,19 @@ abstract class SingleSelectField extends SelectField
{ {
$data = parent::getSchemaStateDefaults(); $data = parent::getSchemaStateDefaults();
$data['value'] = $this->getDefaultValue();
return $data;
}
public function getSchemaDataDefaults()
{
$data = parent::getSchemaDataDefaults();
// Add options to 'data' // Add options to 'data'
$data['data']['hasEmptyDefault'] = $this->getHasEmptyDefault(); $data['data']['hasEmptyDefault'] = $this->getHasEmptyDefault();
$data['data']['emptyString'] = $this->getHasEmptyDefault() ? $this->getEmptyString() : null; $data['data']['emptyString'] = $this->getHasEmptyDefault() ? $this->getEmptyString() : null;
$data['value'] = $this->getDefaultValue();
return $data; return $data;
} }

94
tests/php/Forms/DropdownFieldTest.php
View File

@ -8,6 +8,7 @@ use SilverStripe\Dev\CSSContentParser;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\Forms\DropdownField; use SilverStripe\Forms\DropdownField;
use SilverStripe\Forms\RequiredFields; use SilverStripe\Forms\RequiredFields;
use SilverStripe\Forms\FormTemplateHelper;
use SilverStripe\Forms\FieldList; use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\Form; use SilverStripe\Forms\Form;
use SilverStripe\View\ArrayData; use SilverStripe\View\ArrayData;
@ -148,6 +149,9 @@ class DropdownFieldTest extends SapphireTest
] ]
); );
// Test that an empty option does not comes through in the markup however
$options = $this->findOptionElements($FieldWithoutEmpty->Field());
$this->assertEquals( $this->assertEquals(
1, 1,
count($options), count($options),
@ -155,6 +159,96 @@ class DropdownFieldTest extends SapphireTest
); );
} }
public function testEmpty()
{
$fieldName = 'TestField';
$formName = 'testForm';
// Create mock form
$form = $this->createMock(Form::class);
$form->method('getTemplateHelper')
->willReturn(FormTemplateHelper::singleton());
$form->method('getHTMLID')
->willReturn($formName);
$source = [
'first' => 'value',
0 => 'otherValue'
];
$field = new DropdownField($fieldName, 'Test Field', $source);
$field->setForm($form);
$fieldId = $field->ID();
$this->assertEquals($fieldId, sprintf('%s_%s', $formName, $fieldName));
// Check state for default value
$schemaStateDefaults = $field->getSchemaStateDefaults();
$this->assertArraySubset(
[
'id' => $fieldId,
'name' => $fieldName,
'value' => 'first'
],
$schemaStateDefaults,
true
);
// Check data for empty defaults
$schemaDataDefaults = $field->getSchemaDataDefaults();
$this->assertArraySubset(
[
'id' => $fieldId,
'name' => $fieldName,
'type' => 'text',
'schemaType' => 'SingleSelect',
'holderId' => sprintf('%s_Holder', $fieldId),
'title' => 'Test Field',
'extraClass' => 'dropdown',
'data' => [
'emptyString' => null,
'hasEmptyDefault' => false
]
],
$schemaDataDefaults,
true
);
// Set an empty string of field
$field->setEmptyString('(Any)');
// Check state for default value
$schemaStateDefaults = $field->getSchemaStateDefaults();
$this->assertArraySubset(
[
'id' => $fieldId,
'name' => $fieldName,
'value' => ''
],
$schemaStateDefaults,
true
);
// Check data for empty defaults
$schemaDataDefaults = $field->getSchemaDataDefaults();
$this->assertArraySubset(
[
'id' => $fieldId,
'name' => $fieldName,
'type' => 'text',
'schemaType' => 'SingleSelect',
'holderId' => sprintf('%s_Holder', $fieldId),
'title' => 'Test Field',
'extraClass' => 'dropdown',
'data' => [
'emptyString' => '(Any)',
'hasEmptyDefault' => true
]
],
$schemaDataDefaults,
true
);
}
public function testZeroArraySourceNotOverwrittenByEmptyString() public function testZeroArraySourceNotOverwrittenByEmptyString()
{ {
$source = [0=>'zero']; $source = [0=>'zero'];