From ac105c838396a6bd0cb13b455dc7d3562ac43360 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Thu, 1 Jan 2015 16:41:08 -0500 Subject: views: branch/paginate: fix incorrectly enabled "next" link When the number of commits on a branch page is less than 'commits_per_page', the pagination "next" link is disabled, indicating correctly that this is the final page. However, if the number of commits on the branch page is exactly 'commits_per_page', then the "next" link is incorrectly enabled, even on the final page. When clicked, the user is taken to a "404 Page not found" error page, which makes for a poor user experience. Fix this problem by reliably detecting when the branch page is the final one. Do so by asking for (but not displaying) one commit more than actually needed by the page. If the additional commit is successfully retrieved, then another page definitely follows this one. If not retrieved, then this is definitely the final page. (Unfortunately, the seemingly more expedient approach of checking if the final commit on the current page is a root commit -- has no parents -- is not a reliable indicator that this the final page since a branch may have multiple root commits due to merging.) Signed-off-by: Eric Sunshine Signed-off-by: Alberto Bertogli --- views/branch.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'views/branch.html') diff --git a/views/branch.html b/views/branch.html index 79ea880..a49150e 100644 --- a/views/branch.html +++ b/views/branch.html @@ -18,7 +18,7 @@

% commits = repo.commits("refs/heads/" + repo.branch, -% limit = repo.info.commits_per_page, +% limit = repo.info.commits_per_page + 1, % offset = repo.info.commits_per_page * offset) % commits = list(commits) @@ -26,8 +26,12 @@ % abort(404, "No more commits") % end +% more = len(commits) > repo.info.commits_per_page +% if more: +% commits = commits[:-1] +% end -% include paginate nelem = len(commits), max_per_page = repo.info.commits_per_page, offset = offset +% include paginate more = more, offset = offset % kwargs = dict(repo=repo, commits=commits, % shorten=shorten, repo_root="../..") @@ -35,7 +39,7 @@

-% include paginate nelem = len(commits), max_per_page = repo.info.commits_per_page, offset = offset +% include paginate more = more, offset = offset -- cgit v1.2.3