Merge pull request #3076 from wallabag/hotfix/2979

Disable negative numbers in filters

diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
index 2c2ec0c106ac1d72073649907f45a634ff7ad2ba..c544815ebc7dee9bb308787940559ee376565af3 100644 (file)
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
@@ -98,12 +98,13 @@ class EntryRestController extends WallabagRestController
         $tags = $request->query->get('tags', '');
         $since = $request->query->get('since', 0);
 
+        /** @var \Pagerfanta\Pagerfanta $pager */
         $pager = $this->getDoctrine()
             ->getRepository('WallabagCoreBundle:Entry')
             ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags);
 
-        $pager->setCurrentPage($page);
         $pager->setMaxPerPage($perPage);
+        $pager->setCurrentPage($page);
 
         $pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
         $paginatedCollection = $pagerfantaFactory->createRepresentation(

diff --git a/src/Wallabag/ApiBundle/Form/Type/ClientType.php b/src/Wallabag/ApiBundle/Form/Type/ClientType.php
index 0ea1a9c5c6469c60c4126ba5773cf1172d4a7894..eaea4febe2c17d3550d8eccd4e5a84233ecf2ede 100644 (file)
--- a/src/Wallabag/ApiBundle/Form/Type/ClientType.php
+++ b/src/Wallabag/ApiBundle/Form/Type/ClientType.php
@@ -16,7 +16,11 @@ class ClientType extends AbstractType
     {
         $builder
             ->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'])
         ;
 

diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 7e3b9dd4f93ce52c0ba523605b03b0f86aef0c0f..1714ce74aa549e2cdddcb9f231dc946148e0a75f 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -39,9 +39,11 @@ class ConfigType extends AbstractType
             ])
             ->add('items_per_page', null, [
                 'label' => 'config.form_settings.items_per_page_label',
+                'property_path' => 'itemsPerPage',
             ])
             ->add('reading_speed', ChoiceType::class, [
                 'label' => 'config.form_settings.reading_speed.label',
+                'property_path' => 'readingSpeed',
                 'choices' => [
                     'config.form_settings.reading_speed.100_word' => '0.5',
                     'config.form_settings.reading_speed.200_word' => '1',
@@ -51,6 +53,7 @@ class ConfigType extends AbstractType
             ])
             ->add('action_mark_as_read', ChoiceType::class, [
                 'label' => 'config.form_settings.action_mark_as_read.label',
+                'property_path' => 'actionMarkAsRead',
                 'choices' => [
                     '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,
@@ -61,6 +64,7 @@ class ConfigType extends AbstractType
                 '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, [

diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
index 40e5b5b9a2cd88e120cd32a96cf0ddbb71208a08..c37156465314d39d602724fadd7b50c41258730f 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
@@ -21,6 +21,7 @@ class EditEntryType extends AbstractType
             ->add('is_public', CheckboxType::class, [
                 'required' => false,
                 'label' => 'entry.edit.is_public_label',
+                'property_path' => 'isPublic',
             ])
             ->add('url', TextType::class, [
                 'disabled' => true,

diff --git a/src/Wallabag/CoreBundle/Form/Type/RssType.php b/src/Wallabag/CoreBundle/Form/Type/RssType.php
index 94324fed6d31459e27db3eeceb24dd63ae68d276..49b31c1e2f9abd2d548dd2d69adabc218612047a 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/RssType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/RssType.php
@@ -14,6 +14,7 @@ class RssType extends AbstractType
         $builder
             ->add('rss_limit', null, [
                 'label' => 'config.form_rss.rss_limit',
+                'property_path' => 'rssLimit',
             ])
             ->add('save', SubmitType::class, [
                 'label' => 'config.form.save',

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
index db193e8199efee2a66452095ce748c7d802ed7fe..f82e5dc5262ba1eb2383ee931fa2b7580372602b 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
@@ -106,8 +106,8 @@
                             <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
                             <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
                             <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
-                            <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
-                            <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
+                            <tr><td>j0k3r/graby</td><td>MIT</td></tr>
+                            <tr><td>j0k3r/graby-site-config</td><td>Public domain</td></tr>
                             <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
                             <tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
                             <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>

diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
index fc0d97e77fa4239fab034bf979398c7f4734984a..32984c845483e912c1cf30b40f716c221fa85959 100644 (file)
--- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
@@ -5,7 +5,7 @@
     <div class="card-content">
 
         {% if error %}
-            <script>Materialize.toast('{{ error.message }}', 4000)</script>
+            <script>Materialize.toast('{{ error.messageKey|trans(error.messageData, 'security') }}', 4000)</script>
         {% endif %}
 
         {% for flashMessage in app.session.flashbag.get('notice') %}

diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
index 409a82914680f8618139ced4632491fd61f34dc2..63d70bd9bb3b1c2ef51f59a6e1c05921e0cd4c88 100644 (file)
--- a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
@@ -156,6 +156,22 @@ class EntryRestControllerTest extends WallabagApiTestCase
         $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
     }
 
+    public function testGetEntriesOnPageTwo()
+    {
+        $this->client->request('GET', '/api/entries', [
+            'page' => 2,
+            'perPage' => 2,
+        ]);
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+
+        $this->assertGreaterThanOrEqual(0, $content['total']);
+        $this->assertEquals(2, $content['page']);
+        $this->assertEquals(2, $content['limit']);
+    }
+
     public function testGetStarredEntries()
     {
         $this->client->request('GET', '/api/entries', ['starred' => 1, 'sort' => 'updated']);