diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php index 6af9c96a1..bfe618b1c 100644 --- a/modules/backend/widgets/Form.php +++ b/modules/backend/widgets/Form.php @@ -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; } diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php index 16dac4ddc..d2c56ddb3 100644 --- a/modules/backend/widgets/Lists.php +++ b/modules/backend/widgets/Lists.php @@ -468,7 +468,6 @@ class Lists extends WidgetBase $this->columns = array_merge($orderedDefinitions, $this->columns); } - return $this->columns; }