Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-01 10:01:26 +01:00
Code Issues Packages Projects Releases Activity

FlexForm: Fixed missing inputs after save, reset form after save

Browse Source
This commit is contained in:
Matias Griese
2019-01-08 13:52:13 +02:00
parent 2c55fe01ac
commit c04208d5dd
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
system/src/Grav/Framework/Flex/FlexForm.php
View File

@@ -184,11 +184,11 @@ class FlexForm implements FlexFormInterface
*/
public function getValue(string $name)
{
if (null === $this->data) {
return $this->getObject()->getNestedProperty($name);
}
// Attempt to get value from the form data.
$value = $this->data ? $this->data->get($name) : null;
return $this->data->get($name);
// Return the form data or fall back to the object property.
return $value ?? $this->getObject()->getNestedProperty($name);
}
/**
@@ -221,8 +221,6 @@ class FlexForm implements FlexFormInterface
$data = $blueprint->processForm($this->decodeData($body['data'] ?? []), $body['toggleable_data'] ?? []);
$this->submit($data, $files);
$flash->delete();
} catch (\Exception $e) {
$this->errors[] = $e->getMessage();
}
@@ -548,6 +546,7 @@ class FlexForm implements FlexFormInterface
$object->save();
$this->setObject($object);
$this->reset();
}
protected function checkUploads(array $files): void