X-Git-Url: https://git.mdrn.pl/django-pagination.git/blobdiff_plain/3ff8109af2292cce90bcd7cd8745e30598a1d5fc..9e414cdd4ecdd1eaebd9fce9582adb163705f674:/pagination/templatetags/pagination_tags.py

diff --git a/pagination/templatetags/pagination_tags.py b/pagination/templatetags/pagination_tags.py
index aa5297a..3733434 100644
--- a/pagination/templatetags/pagination_tags.py
+++ b/pagination/templatetags/pagination_tags.py
@@ -2,8 +2,9 @@ try:
     set
 except NameError:
     from sets import Set as set
+
 from django import template
-from django.db.models.query import QuerySet
+from django.http import Http404
 from django.core.paginator import Paginator, InvalidPage
 from django.conf import settings
 
@@ -12,6 +13,8 @@ register = template.Library()
 DEFAULT_PAGINATION = getattr(settings, 'PAGINATION_DEFAULT_PAGINATION', 20)
 DEFAULT_WINDOW = getattr(settings, 'PAGINATION_DEFAULT_WINDOW', 4)
 DEFAULT_ORPHANS = getattr(settings, 'PAGINATION_DEFAULT_ORPHANS', 0)
+INVALID_PAGE_RAISES_404 = getattr(settings,
+    'PAGINATION_INVALID_PAGE_RAISES_404', False)
 
 def do_autopaginate(parser, token):
     """
@@ -28,8 +31,8 @@ def do_autopaginate(parser, token):
         try:
             context_var = split[as_index + 1]
         except IndexError:
-            raise template.TemplateSyntaxError("Context variable assignment " +\
-                "must take the form of {%% %r object.example_set.all ... as " +\
+            raise template.TemplateSyntaxError("Context variable assignment " +
+                "must take the form of {%% %r object.example_set.all ... as " +
                 "context_var_name %%}" % split[0])
         del split[as_index:as_index + 2]
     if len(split) == 2:
@@ -41,11 +44,12 @@ def do_autopaginate(parser, token):
         try:
             orphans = int(split[3])
         except ValueError:
-            raise template.TemplateSyntaxError(u'Got %s, but expected integer.' % split[3])
+            raise template.TemplateSyntaxError(u'Got %s, but expected integer.'
+                % split[3])
         return AutoPaginateNode(split[1], paginate_by=split[2], orphans=orphans,
             context_var=context_var)
     else:
-        raise template.TemplateSyntaxError('%r tag takes one required ' + \
+        raise template.TemplateSyntaxError('%r tag takes one required ' +
             'argument and one optional argument' % split[0])
 
 class AutoPaginateNode(template.Node):
@@ -86,6 +90,9 @@ class AutoPaginateNode(template.Node):
         try:
             page_obj = paginator.page(context['request'].page)
         except InvalidPage:
+            if INVALID_PAGE_RAISES_404:
+                raise Http404('Invalid page requested.  If DEBUG were set to ' +
+                    'False, an HTTP 404 page would have been shown instead.')
             context[key] = []
             context['invalid_page'] = True
             return u''
@@ -145,7 +152,7 @@ def paginate(context, window=DEFAULT_WINDOW):
         if len(first.intersection(current)) == 0:
             first_list = list(first)
             first_list.sort()
-            second_list = list(second)
+            second_list = list(current)
             second_list.sort()
             pages.extend(first_list)
             diff = second_list[0] - first_list[-1]
@@ -192,6 +199,7 @@ def paginate(context, window=DEFAULT_WINDOW):
             differenced.sort()
             pages.extend(differenced)
         to_return = {
+            'MEDIA_URL': settings.MEDIA_URL,
             'pages': pages,
             'page_obj': page_obj,
             'paginator': paginator,
@@ -208,5 +216,7 @@ def paginate(context, window=DEFAULT_WINDOW):
         return to_return
     except KeyError, AttributeError:
         return {}
-register.inclusion_tag('pagination/pagination.html', takes_context=True)(paginate)
+
+register.inclusion_tag('pagination/pagination.html', takes_context=True)(
+    paginate)
 register.tag('autopaginate', do_autopaginate)