8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-16 00:13:12 +00:00

Fixe #111: Supression du paginateur si page unique

This commit is contained in:
grisel-davy 2018-05-03 13:45:13 +02:00
parent c2facd8a27
commit 5575995437

View file

@ -297,16 +297,20 @@ def re2o_paginator(request, query_set, pagination_number):
:request: :request:
:query_set: Query_set to paginate :query_set: Query_set to paginate
:pagination_number: Number of entries to display""" :pagination_number: Number of entries to display"""
paginator = Paginator(query_set, pagination_number) if query_set.count() > pagination_number:
page = request.GET.get('page') paginator = Paginator(query_set, pagination_number)
try: page = request.GET.get('page')
results = paginator.page(page) try:
except PageNotAnInteger: results = paginator.page(page)
# If page is not an integer, deliver first page. except PageNotAnInteger:
results = paginator.page(1) # If page is not an integer, deliver first page.
except EmptyPage: results = paginator.page(1)
# If page is out of range (e.g. 9999), deliver last page of results. except EmptyPage:
results = paginator.page(paginator.num_pages) # If page is out of range (e.g. 9999), deliver last page of results.
results = paginator.page(paginator.num_pages)
else:
#If there is only one page, deliver the page without paginator
return query_set
return results return results