mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-06 06:48:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3082 from aaa2000/fix-form-errors-display

Browse source 
Fix display the form errors correctly
This commit is contained in:
Jérémy Benoist 2017-05-05 07:01:28 +02:00 committed by GitHub
commit 6603a9d649
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Wallabag/ApiBundle/Form/Type/ClientType.php
View file

@ -16,7 +16,11 @@ class ClientType extends AbstractType
{ {
$builder $builder
->add('name', TextType::class, ['label' => 'developer.client.form.name_label']) ->add('name', TextType::class, ['label' => 'developer.client.form.name_label'])
->add('redirect_uris', UrlType::class, ['required' => false, 'label' => 'developer.client.form.redirect_uris_label']) ->add('redirect_uris', UrlType::class, [
'required' => false,
'label' => 'developer.client.form.redirect_uris_label',
'property_path' => 'redirectUris',
])
->add('save', SubmitType::class, ['label' => 'developer.client.form.save_label']) ->add('save', SubmitType::class, ['label' => 'developer.client.form.save_label'])
; ;

4
src/Wallabag/CoreBundle/Form/Type/ConfigType.php
View file

@ -39,9 +39,11 @@ class ConfigType extends AbstractType
]) ])
->add('items_per_page', null, [ ->add('items_per_page', null, [
'label' => 'config.form_settings.items_per_page_label', 'label' => 'config.form_settings.items_per_page_label',
'property_path' => 'itemsPerPage',
]) ])
->add('reading_speed', ChoiceType::class, [ ->add('reading_speed', ChoiceType::class, [
'label' => 'config.form_settings.reading_speed.label', 'label' => 'config.form_settings.reading_speed.label',
'property_path' => 'readingSpeed',
'choices' => [ 'choices' => [
'config.form_settings.reading_speed.100_word' => '0.5', 'config.form_settings.reading_speed.100_word' => '0.5',
'config.form_settings.reading_speed.200_word' => '1', 'config.form_settings.reading_speed.200_word' => '1',
@ -51,6 +53,7 @@ class ConfigType extends AbstractType
]) ])
->add('action_mark_as_read', ChoiceType::class, [ ->add('action_mark_as_read', ChoiceType::class, [
'label' => 'config.form_settings.action_mark_as_read.label', 'label' => 'config.form_settings.action_mark_as_read.label',
'property_path' => 'actionMarkAsRead',
'choices' => [ 'choices' => [
'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE, 'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE,
'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE, 'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE,
@ -61,6 +64,7 @@ class ConfigType extends AbstractType
'label' => 'config.form_settings.language_label', 'label' => 'config.form_settings.language_label',
]) ])
->add('pocket_consumer_key', null, [ ->add('pocket_consumer_key', null, [
'property_path' => 'pocketConsumerKey',
'label' => 'config.form_settings.pocket_consumer_key_label', 'label' => 'config.form_settings.pocket_consumer_key_label',
]) ])
->add('save', SubmitType::class, [ ->add('save', SubmitType::class, [

1
src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
View file

@ -21,6 +21,7 @@ class EditEntryType extends AbstractType
->add('is_public', CheckboxType::class, [ ->add('is_public', CheckboxType::class, [
'required' => false, 'required' => false,
'label' => 'entry.edit.is_public_label', 'label' => 'entry.edit.is_public_label',
'property_path' => 'isPublic',
]) ])
->add('url', TextType::class, [ ->add('url', TextType::class, [
'disabled' => true, 'disabled' => true,

1
src/Wallabag/CoreBundle/Form/Type/RssType.php
View file

@ -14,6 +14,7 @@ class RssType extends AbstractType
$builder $builder
->add('rss_limit', null, [ ->add('rss_limit', null, [
'label' => 'config.form_rss.rss_limit', 'label' => 'config.form_rss.rss_limit',
'property_path' => 'rssLimit',
]) ])
->add('save', SubmitType::class, [ ->add('save', SubmitType::class, [
'label' => 'config.form.save', 'label' => 'config.form.save',