Allow for a variable as the paginate_by parameter. Also added tests for this case...

[django-pagination.git] / pagination / middleware.py

diff --git a/pagination/middleware.py b/pagination/middleware.py
index 8a541fb..5e917c5 100644 (file)
--- a/pagination/middleware.py
+++ b/pagination/middleware.py
@@ -1,6 +1,10 @@
 class PaginationMiddleware(object):
 class PaginationMiddleware(object):

+    """
+    Inserts a variable representing the current page onto the request object if
+    it exists in either **GET** or **POST** portions of the request.
+    """

     def process_request(self, request):
         try:
     def process_request(self, request):
         try:

-            request.page = int(request['page'])
-        except KeyError:
+            request.page = int(request.REQUEST['page'])
+        except (KeyError, ValueError, TypeError):

             request.page = 1
\ No newline at end of file
             request.page = 1
\ No newline at end of file