From 786f413a03df1e4d0485213d8c1d796d15ac114d Mon Sep 17 00:00:00 2001 From: Stanislav Panasik Date: Sun, 11 Jul 2010 18:26:16 +0600 Subject: [PATCH] Added support for multiple paginations on the same template. (Florian Schlachter ) --- pagination/middleware.py | 6 +-- .../templates/pagination/pagination.html | 6 +-- pagination/templatetags/pagination_tags.py | 41 ++++++++++-------- pagination/tests.py | 42 +++++-------------- 4 files changed, 41 insertions(+), 54 deletions(-) diff --git a/pagination/middleware.py b/pagination/middleware.py index f8a2a6f..676f909 100644 --- a/pagination/middleware.py +++ b/pagination/middleware.py @@ -1,10 +1,10 @@ -def get_page(self): +def get_page(self, suffix): """ A function which will be monkeypatched onto the request to get the current integer representing the current page. """ try: - return int(self.REQUEST['page']) + return int(self.REQUEST['page%s' % suffix]) except (KeyError, ValueError, TypeError): return 1 @@ -14,4 +14,4 @@ class PaginationMiddleware(object): it exists in either **GET** or **POST** portions of the request. """ def process_request(self, request): - request.__class__.page = property(get_page) \ No newline at end of file + request.__class__.page = get_page \ No newline at end of file diff --git a/pagination/templates/pagination/pagination.html b/pagination/templates/pagination/pagination.html index fe566a8..c2fb72d 100644 --- a/pagination/templates/pagination/pagination.html +++ b/pagination/templates/pagination/pagination.html @@ -2,7 +2,7 @@ {% load i18n %}