Use has_other_pages() to check if the pagination bar should be shown (

DMOJ#1446) ...rather than the number of pages since the infinite paginator returns a constant 1e3000 even if there is only 1 page.
SchOJ · Sep 28, 2020 · 0ae29d1 · 0ae29d1
1 parent 5fb8b1a
commit 0ae29d1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/templates/blog/list.html b/templates/blog/list.html
@@ -64,7 +64,7 @@ <h2 class="ui header">
                 </section>
                 {% endfor %}
             </div>
-            {% if page_obj.num_pages > 1 %}
+            {% if page_obj.has_other_pages() %}
                 {% include "list-pages.html" %}
             {% endif %}
         </div>

diff --git a/templates/contest/list.html b/templates/contest/list.html
@@ -239,7 +239,7 @@ <h4>{{ _('Upcoming Contests') }}</h4>
 
         {% if past_contests %}
             <h4>{{ _('Past Contests') }}</h4>
-            {% if page_obj and page_obj.num_pages > 1 %}
+            {% if page_obj and page_obj.has_other_pages() %}
                 <div style="margin-bottom: 4px;">
                     {% include "list-pages.html" %}
                 </div>
@@ -277,7 +277,7 @@ <h4>{{ _('Past Contests') }}</h4>
                 {% endfor %}
                 </tbody>
             </table>
-            {% if page_obj and page_obj.num_pages > 1 %}
+            {% if page_obj and page_obj.has_other_pages() %}
                 <div style="margin-top: 10px;">
                     {% include "list-pages.html" %}
                 </div>

diff --git a/templates/problem/list.html b/templates/problem/list.html
@@ -152,7 +152,7 @@
 {% endblock %}
 
 {% block body %}
-    {% if page_obj.num_pages > 1 %}
+    {% if page_obj.has_other_pages() %}
         <div style="margin-bottom: 7px; margin-top: 11px;">
             {% include "list-pages.html" %}
         </div>
@@ -268,7 +268,7 @@
                     {% endfor %}
                     </tbody>
                 </table>
-                {% if page_obj.num_pages > 1 %}
+                {% if page_obj.has_other_pages() %}
                     {% include "list-pages.html" %}
                 {% endif %}
             </div>

diff --git a/templates/submission/list.html b/templates/submission/list.html
@@ -293,7 +293,7 @@
 {% endblock %}
 
 {% block body %}
-    {% if page_obj.num_pages > 1 %}
+    {% if page_obj.has_other_pages() %}
         <div style="margin-bottom: 6px; margin-top: 11px">
             {% include "list-pages.html" %}
         </div>
@@ -317,7 +317,7 @@
                 {% endfor %}
                 </tbody>
             </table>
-            {% if page_obj.num_pages > 1 %}
+            {% if page_obj.has_other_pages() %}
                 <div style="margin-top:10px;">{% include "list-pages.html" %}</div>
             {% endif %}
         </div>

diff --git a/templates/ticket/list.html b/templates/ticket/list.html
@@ -252,7 +252,7 @@
         </aside>
 
         <main>
-            {% if page_obj.num_pages > 1 %}
+            {% if page_obj.has_other_pages() %}
                 {% include "list-pages.html" %}
             {% endif %}
             <div class="h-scrollable-table">            
@@ -273,7 +273,7 @@
                     </tbody>
                 </table>
             </div>
-            {% if page_obj.num_pages > 1 %}
+            {% if page_obj.has_other_pages() %}
                 {% include "list-pages.html" %}
             {% endif %}
         </main>

diff --git a/templates/user/base-users.html b/templates/user/base-users.html
@@ -67,7 +67,7 @@
 {% block body %}
     <div id="common-content">
         <div id="content-left" class="users">
-            {% if page_obj and page_obj.num_pages > 1 %}
+            {% if page_obj and page_obj.has_other_pages() %}
                 <div class="user-pagination">
                     {% include "list-pages.html" %}
                     <form id="search-form" name="form" action="{{ url('user_ranking_redirect') }}" method="get">
@@ -87,7 +87,7 @@
                 </table>
             </div>
 
-            {% if page_obj and page_obj.num_pages > 1 %}
+            {% if page_obj and page_obj.has_other_pages() %}
                 {% include "list-pages.html" %}
             {% endif %}
         </div>