mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fixes an issue where unfilled relations are not populated in forms

Browse Source
This commit is contained in:
Sam Georges 2014-07-28 17:28:39 +10:00
parent d8ca802401
commit 4fa00f1c7b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/backend/widgets/Form.php
View File

@ -600,14 +600,16 @@ class Form extends WidgetBase
/*
* Loop the field key parts and build a value.
* To support relations only the last ield should return the
* To support relations only the last field should return the
* relation value, all others will look up the relation object as normal.
*/
foreach ($keyParts as $key) {
if ($key == $lastField && $result instanceof Model && $result->hasRelation($key)) {
if (!$result = $result->getRelationValue($key))
return $defaultValue;
if ($result instanceof Model && $result->hasRelation($key)) {
if ($key == $lastField)
$result = $result->getRelationValue($key) ?: $defaultValue;
else
$result = $result->{$key};
}
elseif (is_array($result)) {
if (!array_key_exists($key, $result)) return $defaultValue;