tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-02 01:19:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8684 from phptek/issue/8459

Browse Source 
FIX: Fixes #8459 Missing conditionals for optional constructor args
This commit is contained in:
Maxime Rainville 2018-12-19 14:08:32 +13:00 committed by GitHub
commit b22af5303f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Forms/Form.php
View File

@ -286,6 +286,9 @@ class Form extends ViewableData implements HasRequestHandler
) { ) {
parent::__construct(); parent::__construct();
$fields = $fields ? $fields : FieldList::create();
$actions = $actions ? $actions : FieldList::create();
$fields->setForm($this); $fields->setForm($this);
$actions->setForm($this); $actions->setForm($this);
@ -484,11 +487,13 @@ class Form extends ViewableData implements HasRequestHandler
// Set message on either a field or the parent form // Set message on either a field or the parent form
foreach ($result->getMessages() as $message) { foreach ($result->getMessages() as $message) {
$fieldName = $message['fieldName']; $fieldName = $message['fieldName'];
if ($fieldName) { if ($fieldName) {
$owner = $this->fields->dataFieldByName($fieldName) ?: $this; $owner = $this->fields->dataFieldByName($fieldName) ?: $this;
} else { } else {
$owner = $this; $owner = $this;
} }
$owner->setMessage($message['message'], $message['messageType'], $message['messageCast']); $owner->setMessage($message['message'], $message['messageType'], $message['messageCast']);
} }
return $this; return $this;
@ -772,7 +777,9 @@ class Form extends ViewableData implements HasRequestHandler
*/ */
public function setFields($fields) public function setFields($fields)
{ {
$fields->setForm($this);
$this->fields = $fields; $this->fields = $fields;
return $this; return $this;
} }
@ -794,7 +801,9 @@ class Form extends ViewableData implements HasRequestHandler
*/ */
public function setActions($actions) public function setActions($actions)
{ {
$actions->setForm($this);
$this->actions = $actions; $this->actions = $actions;
return $this; return $this;
} }
@ -1405,8 +1414,9 @@ class Form extends ViewableData implements HasRequestHandler
$submitted = true; $submitted = true;
} }
// dont include fields without data // Don't include fields without data
$dataFields = $this->Fields()->dataFields(); $dataFields = $this->Fields()->dataFields();
if (!$dataFields) { if (!$dataFields) {
return $this; return $this;
} }