X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FForm%2FType%2FConfigType.php;h=6901fa08e2f2755d3b0466c581c066bb80694795;hb=48b0163d247554d7e2f1ec63b717c8216ea9ec59;hp=74c53bf058d3825e39b0efdb005b6c0807622eb4;hpb=d37bb05c881bfdbeb1144b327edd4dcc2cbb163f;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 74c53bf0..6901fa08 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -4,9 +4,11 @@ namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Wallabag\CoreBundle\Entity\Config;
 
 class ConfigType extends AbstractType
 {
@@ -21,7 +23,9 @@ class ConfigType extends AbstractType
     {
         $this->themes = array_combine(
             $themes,
-            array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes)
+            array_map(function ($s) {
+                return ucwords(strtolower(str_replace('-', ' ', $s)));
+            }, $themes)
         );
 
         $this->languages = $languages;
@@ -34,22 +38,30 @@ class ConfigType extends AbstractType
                 'choices' => array_flip($this->themes),
                 'label' => 'config.form_settings.theme_label',
             ])
-            ->add('items_per_page', null, [
+            ->add('items_per_page', IntegerType::class, [
                 'label' => 'config.form_settings.items_per_page_label',
+                'property_path' => 'itemsPerPage',
             ])
-            ->add('reading_speed', ChoiceType::class, [
+            ->add('reading_speed', IntegerType::class, [
                 'label' => 'config.form_settings.reading_speed.label',
+                'property_path' => 'readingSpeed',
+            ])
+            ->add('action_mark_as_read', ChoiceType::class, [
+                'label' => 'config.form_settings.action_mark_as_read.label',
+                'property_path' => 'actionMarkAsRead',
                 'choices' => [
-                    'config.form_settings.reading_speed.100_word' => '0.5',
-                    'config.form_settings.reading_speed.200_word' => '1',
-                    'config.form_settings.reading_speed.300_word' => '1.5',
-                    'config.form_settings.reading_speed.400_word' => '2',
+                    '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,
                 ],
             ])
             ->add('language', ChoiceType::class, [
                 'choices' => array_flip($this->languages),
                 'label' => 'config.form_settings.language_label',
             ])
+            ->add('pocket_consumer_key', null, [
+                'property_path' => 'pocketConsumerKey',
+                'label' => 'config.form_settings.pocket_consumer_key_label',
+            ])
             ->add('save', SubmitType::class, [
                 'label' => 'config.form.save',
             ])