diff options
author | Aurélien Bompard <aurelien@bompard.org> | 2013-06-06 20:07:06 +0200 |
---|---|---|
committer | Aurélien Bompard <aurelien@bompard.org> | 2013-06-06 20:07:06 +0200 |
commit | 28ebf918ca25ba170bb8ad0ac3e2c740d34f9301 (patch) | |
tree | 6808590c2f6ba39b1e48a789a9d790e9b0968d5c /hyperkitty/views/search.py | |
parent | c0047ae6ec63a5ed745f733efca51ce332a296da (diff) | |
download | hyperkitty-28ebf918ca25ba170bb8ad0ac3e2c740d34f9301.tar.gz hyperkitty-28ebf918ca25ba170bb8ad0ac3e2c740d34f9301.tar.xz hyperkitty-28ebf918ca25ba170bb8ad0ac3e2c740d34f9301.zip |
Greatly improve the pager
Diffstat (limited to 'hyperkitty/views/search.py')
-rw-r--r-- | hyperkitty/views/search.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/hyperkitty/views/search.py b/hyperkitty/views/search.py index 199a836..9ea224a 100644 --- a/hyperkitty/views/search.py +++ b/hyperkitty/views/search.py @@ -24,7 +24,7 @@ from django.shortcuts import render from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, Page from hyperkitty.models import Tag -from hyperkitty.lib import get_store +from hyperkitty.lib import get_store, paginate from hyperkitty.lib.voting import get_votes, set_message_votes from .list import _thread_list @@ -91,20 +91,11 @@ def search(request, page=1): raise Http404("No archived mailing-list by that name.") paginator = SearchPaginator(messages, 10, total) - try: - messages = paginator.page(page_num) - except PageNotAnInteger: - # If page is not an integer, deliver first page. - messages = paginator.page(1) - except EmptyPage: - # If page is out of range (e.g. 9999), deliver last page of results. - messages = paginator.page(paginator.num_pages) - messages.page_range = [ p+1 for p in range(paginator.num_pages) ] + messages = paginate(messages, page_num, paginator=paginator) context = { 'mlist' : mlist, "query": query, - 'current_page': page_num, 'messages': messages, 'total': total, } |