TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRY up code from #1504

This commit is contained in:
Samuel Georges 2015-10-17 10:16:49 +11:00
parent 7d911c2c9f
commit ef22ac934d
3 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
modules/backend/classes/FormField.php
View File

@ -543,12 +543,65 @@ class FormField
* Returns this fields value from a supplied data set, which can be
* an array or a model or another generic collection.
* @param mixed $data
* @param mixed $default
* @return mixed
*/
public function getValueFromData($data, $default = null)
{
$fieldName = $this->valueFrom ?: $this->fieldName;
return $this->getFieldNameFromData($fieldName, $data, $default);
}
/**
* Returns the default value for this field, the supplied data is used
* to source data when defaultFrom is specified.
* @param mixed $data
* @return mixed
*/
public function getDefaultFromData($data)
{
if ($this->defaultFrom) {
return $this->getFieldNameFromData($this->defaultFrom, $data);
}
if ($this->defaults !== '') {
return $this->defaults;
}
return null;
}
/**
* Returns the final model and attribute name of a nested attribute.
* Eg: list($model, $attribute) = $this->resolveAttribute('person[phone]');
* @param string $attribute.
* @return array
*/
public function resolveModelAttribute($model, $attribute = null)
{
if ($attribute === null) {
$attribute = $this->valueFrom ?: $this->fieldName;
}
$parts = is_array($attribute) ? $attribute : HtmlHelper::nameToArray($attribute);
$last = array_pop($parts);
foreach ($parts as $part) {
$model = $model->{$part};
}
return [$model, $last];
}
/**
* Internal method to extract the value of a field name from a data set.
* @param string $fieldName
* @param mixed $data
* @param mixed $default
* @return mixed
*/
protected function getFieldNameFromData($fieldName, $data, $default = null)
{
/*
* Array field name, eg: field[key][key2][key3]
*/
@ -588,26 +641,4 @@ class FormField
return $result;
}
/**
* Returns the final model and attribute name of a nested attribute.
* Eg: list($model, $attribute) = $this->resolveAttribute('person[phone]');
* @param string $attribute.
* @return array
*/
public function resolveModelAttribute($model, $attribute = null)
{
if ($attribute === null) {
$attribute = $this->valueFrom ?: $this->fieldName;
}
$parts = is_array($attribute) ? $attribute : HtmlHelper::nameToArray($attribute);
$last = array_pop($parts);
foreach ($parts as $part) {
$model = $model->{$part};
}
return [$model, $last];
}
}

14
modules/backend/classes/FormWidgetBase.php
View File

@ -113,17 +113,9 @@ abstract class FormWidgetBase extends WidgetBase
*/
public function getLoadValue()
{
$defaultValue = null;
if (!$this->model->exists) {
if ($this->formField->defaultFrom) {
list($model, $attribute) = $this->formField->resolveModelAttribute($this->model, $this->formField->defaultFrom);
$defaultValue = $model->{$attribute};
}
elseif ($this->formField->defaults !== '') {
$defaultValue = $this->formField->defaults;
}
}
$defaultValue = !$this->model->exists
? $this->formField->getDefaultFromData($this->data ?: $this->model)
: null;
return $this->formField->getValueFromData($this->data ?: $this->model, $defaultValue);
}

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

@ -775,17 +775,9 @@ class Form extends WidgetBase
$field = $this->allFields[$field];
}
$defaultValue = null;
if (!$this->model->exists) {
if ($field->defaultFrom) {
list($model, $attribute) = $field->resolveModelAttribute($this->model, $field->defaultFrom);
$defaultValue = $model->{$attribute};
}
elseif ($field->defaults !== '') {
$defaultValue = $field->defaults;
}
}
$defaultValue = !$this->model->exists
? $field->getDefaultFromData($this->data)
: null;
return $field->getValueFromData($this->data, $defaultValue);
}