diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Form')
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/ConfigType.php | 11 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index 1714ce74..6901fa08 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |||
@@ -4,6 +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\Extension\Core\Type\ChoiceType; | 6 | use Symfony\Component\Form\Extension\Core\Type\ChoiceType; |
7 | use Symfony\Component\Form\Extension\Core\Type\IntegerType; | ||
7 | use Symfony\Component\Form\Extension\Core\Type\SubmitType; | 8 | use Symfony\Component\Form\Extension\Core\Type\SubmitType; |
8 | use Symfony\Component\Form\FormBuilderInterface; | 9 | use Symfony\Component\Form\FormBuilderInterface; |
9 | use Symfony\Component\OptionsResolver\OptionsResolver; | 10 | use Symfony\Component\OptionsResolver\OptionsResolver; |
@@ -37,19 +38,13 @@ class ConfigType extends AbstractType | |||
37 | 'choices' => array_flip($this->themes), | 38 | 'choices' => array_flip($this->themes), |
38 | 'label' => 'config.form_settings.theme_label', | 39 | 'label' => 'config.form_settings.theme_label', |
39 | ]) | 40 | ]) |
40 | ->add('items_per_page', null, [ | 41 | ->add('items_per_page', IntegerType::class, [ |
41 | 'label' => 'config.form_settings.items_per_page_label', | 42 | 'label' => 'config.form_settings.items_per_page_label', |
42 | 'property_path' => 'itemsPerPage', | 43 | 'property_path' => 'itemsPerPage', |
43 | ]) | 44 | ]) |
44 | ->add('reading_speed', ChoiceType::class, [ | 45 | ->add('reading_speed', IntegerType::class, [ |
45 | 'label' => 'config.form_settings.reading_speed.label', | 46 | 'label' => 'config.form_settings.reading_speed.label', |
46 | 'property_path' => 'readingSpeed', | 47 | 'property_path' => 'readingSpeed', |
47 | 'choices' => [ | ||
48 | 'config.form_settings.reading_speed.100_word' => '0.5', | ||
49 | 'config.form_settings.reading_speed.200_word' => '1', | ||
50 | 'config.form_settings.reading_speed.300_word' => '1.5', | ||
51 | 'config.form_settings.reading_speed.400_word' => '2', | ||
52 | ], | ||
53 | ]) | 48 | ]) |
54 | ->add('action_mark_as_read', ChoiceType::class, [ | 49 | ->add('action_mark_as_read', ChoiceType::class, [ |
55 | 'label' => 'config.form_settings.action_mark_as_read.label', | 50 | 'label' => 'config.form_settings.action_mark_as_read.label', |
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php index 37d0640a..8a575b68 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | |||
@@ -54,8 +54,8 @@ class EntryFilterType extends AbstractType | |||
54 | $lower = $values['value']['left_number'][0]; | 54 | $lower = $values['value']['left_number'][0]; |
55 | $upper = $values['value']['right_number'][0]; | 55 | $upper = $values['value']['right_number'][0]; |
56 | 56 | ||
57 | $min = (int) ($lower * $this->user->getConfig()->getReadingSpeed()); | 57 | $min = (int) ($lower * $this->user->getConfig()->getReadingSpeed() / 200); |
58 | $max = (int) ($upper * $this->user->getConfig()->getReadingSpeed()); | 58 | $max = (int) ($upper * $this->user->getConfig()->getReadingSpeed() / 200); |
59 | 59 | ||
60 | if (null === $lower && null === $upper) { | 60 | if (null === $lower && null === $upper) { |
61 | // no value? no filter | 61 | // no value? no filter |