From e50b3cab06f505c629df6309299dd6a7452883df Mon Sep 17 00:00:00 2001 From: Yaniv Peer Date: Wed, 24 May 2017 14:56:19 +0300 Subject: [PATCH 1/3] =?UTF-8?q?Fix=20for=20pagination=20=E2=80=98last?= =?UTF-8?q?=E2=80=99=20link=20to=20give=20the=20real=20last=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rest_framework_json_api/pagination.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework_json_api/pagination.py b/rest_framework_json_api/pagination.py index d13b6ec4..523b14ec 100644 --- a/rest_framework_json_api/pagination.py +++ b/rest_framework_json_api/pagination.py @@ -64,7 +64,7 @@ def get_last_link(self): url = self.request.build_absolute_uri() url = replace_query_param(url, self.limit_query_param, self.limit) - offset = self.count - self.limit + offset = (self.count // self.limit) * self.limit if offset <= 0: return remove_query_param(url, self.offset_query_param) From 052d8fb593583e4b5c810e5cbbd0a657c8060152 Mon Sep 17 00:00:00 2001 From: Yaniv Peer Date: Sun, 28 May 2017 10:58:59 +0300 Subject: [PATCH 2/3] =?UTF-8?q?Updated=20test=20to=20support=20new=20pagin?= =?UTF-8?q?ation=20=E2=80=98last=E2=80=99=20link=20change?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/tests/unit/test_pagination.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/tests/unit/test_pagination.py b/example/tests/unit/test_pagination.py index b0a08a94..e15bee4a 100644 --- a/example/tests/unit/test_pagination.py +++ b/example/tests/unit/test_pagination.py @@ -41,7 +41,7 @@ def test_valid_offset_limit(self): offset = 10 limit = 5 count = len(self.queryset) - last_offset = count - limit + last_offset = (count // limit) * limit next_offset = 15 prev_offset = 5 From 67f5ec3a90655d44c645ff8e9110fc695d85b2ac Mon Sep 17 00:00:00 2001 From: Yaniv Peer Date: Sun, 28 May 2017 11:00:33 +0300 Subject: [PATCH 3/3] Added myself to AUTHORS --- AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index bc8d6dee..419f2e90 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,4 +4,4 @@ Greg Aker Jerel Unruh Matt Layman Oliver Sauder - +Yaniv Peer