From 25b517274111a17ed2fa616579008be770bd584a Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Fri, 28 Sep 2012 17:14:14 +0300 Subject: [PATCH] Catch EmptyPage exception in paginate empty tag --- snf-astakos-app/astakos/im/templatetags/filters.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/snf-astakos-app/astakos/im/templatetags/filters.py b/snf-astakos-app/astakos/im/templatetags/filters.py index 04320cf..90b2e26 100644 --- a/snf-astakos-app/astakos/im/templatetags/filters.py +++ b/snf-astakos-app/astakos/im/templatetags/filters.py @@ -35,7 +35,7 @@ import calendar import datetime from django import template -from django.core.paginator import Paginator, InvalidPage +from django.core.paginator import Paginator, EmptyPage from django.db.models.query import QuerySet from astakos.im.settings import PAGINATE_BY @@ -116,7 +116,10 @@ def paginate(l, args): page_number = paginator.num_pages else: page_number = 1 - page = globals()['page'] = paginator.page(page_number) + try: + page = paginator.page(page_number) + except EmptyPage: + page = paginator.page(1) return page @register.filter -- 1.7.10.4