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

Fix logic flaws

This commit is contained in:
Sam Georges 2014-06-01 10:23:59 +10:00
parent c1e2e81d65
commit f525b7663b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -594,12 +594,10 @@ class Form extends WidgetBase
private function getOptionsFromModel($field, $fieldOptions)
{
if (is_array($fieldOptions) && is_callable($fieldOptions)) {
return call_user_func($fieldOptions, $this, $field);
$fieldOptions = call_user_func($fieldOptions, $this, $field);
}
elseif (is_array($fieldOptions)) {
return $fieldOptions;
}
elseif (!$fieldOptions) {
if (!is_array($fieldOptions) && !$fieldOptions) {
$methodName = 'get'.studly_case($field->columnName).'Options';
if (!method_exists($this->model, $methodName) && !method_exists($this->model, 'getDropdownOptions'))
throw new ApplicationException(Lang::get('backend::lang.field.options_method_not_exists', ['model'=>get_class($this->model), 'method'=>$methodName, 'field'=>$field->columnName]));
@ -616,7 +614,7 @@ class Form extends WidgetBase
$fieldOptions = $this->model->$fieldOptions($field->value, $field->columnName);
}
return [];
return $fieldOptions;
}
/**