tonyair
/
silverstripe-userforms
mirror of https://github.com/silverstripe/silverstripe-userforms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move parent::onBeforeWrite() to top of function

This commit is contained in:
Steve Boyd 2021-01-17 15:26:01 +13:00 committed by GitHub
parent ad685fdd3f
commit 4d4fd3de49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/Model/EditableFormField.php
View File

@ -411,12 +411,13 @@ class EditableFormField extends DataObject
public function onBeforeWrite()
{
parent::onBeforeWrite();
$formField = $this->getFormField();
if ($formField && !$formField->hasData()) {
$this->Required = false;
}
parent::onBeforeWrite();
// Set a field name.
if (!$this->Name) {

3
tests/Model/EditableFormFieldTest.php
View File

@ -298,10 +298,9 @@ class EditableFormFieldTest extends FunctionalTest
{
$requiredTextField = $this->objFromFixture(EditableTextField::class, 'required-text');
$fieldId = $requiredTextField->ID;
$this->assertTrue((bool)$requiredTextField->Required);
$literalField = $requiredTextField->newClassInstance(EditableLiteralField::class);
$literalField = $requiredTextField->newClassInstance(EditableLiteralField::class);
$this->assertTrue((bool)$literalField->Required);
$literalField->write();