Merge pull request #1328 from wallabag/v2-fix-1324

fix #1324: do not display pagination when only 1 page

diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
index 7629ef35e646e86786dcf4fe20c9cc8cf236198f..ea4a99762282cf54af03e30f8b69ddc70fa82cb8 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
@@ -8,7 +8,7 @@
         <div class="results">
             <div class="nb-results">{{ entries.count }} {% trans %}entries{% endtrans %}</div>
             <div class="pagination">
-                {% for p in range(1, entries.nbPages) %}
+                {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %}
                     <li>
                         <a href="{{ path(app.request.attributes.get('_route'), {'page': p}) }}" class="{{ currentPage == p ? 'current':''}}" >{{ p }}</a>
                     </li>

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index b9f1be495017a964d43fb0ec5a015b2e8df1b0a9..55e3540d77f73629f322cc0b8036602ea13cc650 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -20,7 +20,7 @@
             <div class="nb-results left">{{ entries.count }} {% trans %}entries{% endtrans %}</div>
             <div class="left"><form>{{ form_rest(form) }}<button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">Filter</button></form></div>
             <ul class="pagination right">
-                {% for p in range(1, entries.nbPages) %}
+                {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %}
                     <li class="{{ currentPage == p ? 'active':'waves-effect'}}">
                         <a href="{{ path(app.request.attributes.get('_route'), {'page': p}) }}"  >{{ p }}</a>
                     </li>