undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: only display "next" links in logs if there is a next page

Browse Source 
There was a bug in the implementation of the "next" links in
format_paging_nav (for log and shortlog), which caused the next links
to always be displayed, even if there is no next page.  This fixes it.

Signed-off-by: Lea Wiemann <LeWiemann@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lea Wiemann 2008-05-28 01:25:42 +02:00 committed by Junio C Hamano
parent a17171b473
commit 1f684dc01c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gitweb/gitweb.perl
View File

@ -2676,7 +2676,7 @@ sub git_print_page_nav {
} }
sub format_paging_nav { sub format_paging_nav {
my ($action, $hash, $head, $page, $nrevs) = @_; my ($action, $hash, $head, $page, $has_next_link) = @_;
my $paging_nav; my $paging_nav;
@ -2694,7 +2694,7 @@ sub format_paging_nav {
$paging_nav .= " &sdot; prev"; $paging_nav .= " &sdot; prev";
} }
if ($nrevs >= (100 * ($page+1)-1)) { if ($has_next_link) {
$paging_nav .= " &sdot; " . $paging_nav .= " &sdot; " .
$cgi->a({-href => href(-replay=>1, page=>$page+1), $cgi->a({-href => href(-replay=>1, page=>$page+1),
-accesskey => "n", -title => "Alt-n"}, "next"); -accesskey => "n", -title => "Alt-n"}, "next");
@ -4585,7 +4585,7 @@ sub git_log {
my @commitlist = parse_commits($hash, 101, (100 * $page)); my @commitlist = parse_commits($hash, 101, (100 * $page));
my $paging_nav = format_paging_nav('log', $hash, $head, $page, (100 * ($page+1))); my $paging_nav = format_paging_nav('log', $hash, $head, $page, $#commitlist >= 100);
git_header_html(); git_header_html();
git_print_page_nav('log','', $hash,undef,undef, $paging_nav); git_print_page_nav('log','', $hash,undef,undef, $paging_nav);
@ -5505,7 +5505,7 @@ sub git_shortlog {
my @commitlist = parse_commits($hash, 101, (100 * $page)); my @commitlist = parse_commits($hash, 101, (100 * $page));
my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, (100 * ($page+1))); my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, $#commitlist >= 100);
my $next_link = ''; my $next_link = '';
if ($#commitlist >= 100) { if ($#commitlist >= 100) {
$next_link = $next_link =