diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-06-08 16:35:02 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-06-08 16:35:02 +0200 |
commit | ac9d58211e1c6676485ef15d023215e5a465f3a8 (patch) | |
tree | 8b73ad50783cf8066ec4171367e2dd1e26026636 /src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |
parent | 82d6d9cb06a1486e2e3b05fa6ce857b3b8655180 (diff) | |
parent | 3cf22a05416b9994aa458ea045d232264006e7cf (diff) | |
download | wallabag-ac9d58211e1c6676485ef15d023215e5a465f3a8.tar.gz wallabag-ac9d58211e1c6676485ef15d023215e5a465f3a8.tar.zst wallabag-ac9d58211e1c6676485ef15d023215e5a465f3a8.zip |
Merge branch 'v2' into v2-edit-title
Diffstat (limited to 'src/Wallabag/CoreBundle/Form/Type/ConfigType.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/ConfigType.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index d5890971..49b05b80 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |||
@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type; | |||
4 | 4 | ||
5 | use Symfony\Component\Form\AbstractType; | 5 | use Symfony\Component\Form\AbstractType; |
6 | use Symfony\Component\Form\FormBuilderInterface; | 6 | use Symfony\Component\Form\FormBuilderInterface; |
7 | use Symfony\Component\OptionsResolver\OptionsResolverInterface; | 7 | use Symfony\Component\OptionsResolver\OptionsResolver; |
8 | 8 | ||
9 | class ConfigType extends AbstractType | 9 | class ConfigType extends AbstractType |
10 | { | 10 | { |
@@ -24,14 +24,17 @@ class ConfigType extends AbstractType | |||
24 | public function buildForm(FormBuilderInterface $builder, array $options) | 24 | public function buildForm(FormBuilderInterface $builder, array $options) |
25 | { | 25 | { |
26 | $builder | 26 | $builder |
27 | ->add('theme', 'choice', array('choices' => $this->themes)) | 27 | ->add('theme', 'choice', array( |
28 | 'choices' => array_flip($this->themes), | ||
29 | 'choices_as_values' => true, | ||
30 | )) | ||
28 | ->add('items_per_page') | 31 | ->add('items_per_page') |
29 | ->add('language') | 32 | ->add('language') |
30 | ->add('save', 'submit') | 33 | ->add('save', 'submit') |
31 | ; | 34 | ; |
32 | } | 35 | } |
33 | 36 | ||
34 | public function setDefaultOptions(OptionsResolverInterface $resolver) | 37 | public function configureOptions(OptionsResolver $resolver) |
35 | { | 38 | { |
36 | $resolver->setDefaults(array( | 39 | $resolver->setDefaults(array( |
37 | 'data_class' => 'Wallabag\CoreBundle\Entity\Config', | 40 | 'data_class' => 'Wallabag\CoreBundle\Entity\Config', |