Fixes issue where default value on form fields is not set

This commit is contained in:
Sam Georges 2014-06-08 10:58:39 +10:00
parent de47b6c6a4
commit 8359baa719
2 changed files with 19 additions and 20 deletions

View File

@ -357,6 +357,25 @@ class Form extends WidgetBase
$field->arrayName = $this->arrayName;
$field->idPrefix = $this->getId();
/*
* Process basic options
*/
if (isset($config['span'])) $field->span($config['span']);
if (isset($config['context'])) $field->context = $config['context'];
if (isset($config['size'])) $field->size($config['size']);
if (isset($config['tab'])) $field->tab($config['tab']);
if (isset($config['commentAbove'])) $field->comment($config['commentAbove'], 'above');
if (isset($config['comment'])) $field->comment($config['comment']);
if (isset($config['placeholder'])) $field->placeholder = $config['placeholder'];
if (isset($config['default'])) $field->defaults = $config['default'];
if (isset($config['cssClass'])) $field->cssClass = $config['cssClass'];
if (isset($config['attributes'])) $field->attributes = $config['attributes'];
if (isset($config['path'])) $field->path = $config['path'];
if (array_key_exists('required', $config)) $field->required = $config['required'];
if (array_key_exists('disabled', $config)) $field->disabled = $config['disabled'];
if (array_key_exists('stretch', $config)) $field->stretch = $config['stretch'];
/*
* Set field value
*/
@ -402,25 +421,6 @@ class Form extends WidgetBase
$field->displayAs($fieldType, $fieldOptions);
}
/*
* Process remaining options
*/
if (isset($config['span'])) $field->span($config['span']);
if (isset($config['context'])) $field->context = $config['context'];
if (isset($config['size'])) $field->size($config['size']);
if (isset($config['tab'])) $field->tab($config['tab']);
if (isset($config['commentAbove'])) $field->comment($config['commentAbove'], 'above');
if (isset($config['comment'])) $field->comment($config['comment']);
if (isset($config['placeholder'])) $field->placeholder = $config['placeholder'];
if (isset($config['default'])) $field->defaults = $config['default'];
if (isset($config['cssClass'])) $field->cssClass = $config['cssClass'];
if (isset($config['attributes'])) $field->attributes = $config['attributes'];
if (isset($config['path'])) $field->path = $config['path'];
if (array_key_exists('required', $config)) $field->required = $config['required'];
if (array_key_exists('disabled', $config)) $field->disabled = $config['disabled'];
if (array_key_exists('stretch', $config)) $field->stretch = $config['stretch'];
return $field;
}

View File

@ -468,7 +468,6 @@ class Lists extends WidgetBase
$this->columns = array_merge($orderedDefinitions, $this->columns);
}
return $this->columns;
}