Merge pull request #428 from gnat42/patch-1

If a description is not provided use form label
This commit is contained in:
William Durand 2014-07-04 09:38:41 +02:00
commit 94243f0a3e

View File

@ -187,7 +187,7 @@ class FormTypeParser implements ParserInterface
'default' => null, 'default' => null,
'subType' => $subType, 'subType' => $subType,
'required' => $config->getRequired(), 'required' => $config->getRequired(),
'description' => $config->getAttribute('description'), 'description' => ($config->getOption('description')) ? $config->getOption('description'):$config->getOption('label'),
'readonly' => $config->getDisabled(), 'readonly' => $config->getDisabled(),
'children' => $children, 'children' => $children,
); );
@ -205,7 +205,7 @@ class FormTypeParser implements ParserInterface
'actualType' => 'string', 'actualType' => 'string',
'default' => $config->getData(), 'default' => $config->getData(),
'required' => $config->getRequired(), 'required' => $config->getRequired(),
'description' => $config->getAttribute('description'), 'description' => ($config->getOption('description')) ? $config->getOption('description'):$config->getOption('label'),
'readonly' => $config->getDisabled(), 'readonly' => $config->getDisabled(),
); );
} }
@ -221,7 +221,7 @@ class FormTypeParser implements ParserInterface
'subType' => $subType, 'subType' => $subType,
'default' => $config->getData(), 'default' => $config->getData(),
'required' => $config->getRequired(), 'required' => $config->getRequired(),
'description' => $config->getAttribute('description'), 'description' => ($config->getOption('description')) ? $config->getOption('description'):$config->getOption('label'),
'readonly' => $config->getDisabled(), 'readonly' => $config->getDisabled(),
); );