From 5cd0714dcae2409a05f6aa184afe87f8e9748ed3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 16 Mar 2015 12:05:31 +0000 Subject: [PATCH] Do not paginate if PAGE_SIZE=None --- rest_framework/pagination.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 5e60448d4..b6be6b7cc 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -388,6 +388,9 @@ class LimitOffsetPagination(BasePagination): def paginate_queryset(self, queryset, request, view=None): self.limit = self.get_limit(request) + if self.limit is None: + return None + self.offset = self.get_offset(request) self.count = _get_count(queryset) self.request = request @@ -491,6 +494,9 @@ class CursorPagination(BasePagination): template = 'rest_framework/pagination/previous_and_next.html' def paginate_queryset(self, queryset, request, view=None): + if self.page_size is None: + return None + self.base_url = request.build_absolute_uri() self.ordering = self.get_ordering(request, queryset, view)