Attachment 43536 Details for Bug 15005 – [PASSED QA] Bug 15005: Fix pagination_bar calls

[patch] [PASSED QA] Bug 15005: Fix pagination_bar calls

PASSED-QA-Bug-15005-Fix-paginationbar-calls.patch (text/plain), 1.79 KB, created by Kyle M Hall (khall) on 2015-10-16 16:43:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-10-16 16:43:12 UTC

Size: 1.79 KB

patch

obsolete

>From f3e7def0923882acb2366060924593873f987227 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 13 Oct 2015 15:51:29 +0000
>Subject: [PATCH] [PASSED QA] Bug 15005: Fix pagination_bar calls
>
>Test plan:
>Create an order for an existing biblio, confirm that the pagination links work correctly.
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> C4/Output.pm            |    2 +-
> acqui/neworderbiblio.pl |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/C4/Output.pm b/C4/Output.pm
>index a5f0dab..90249db 100644
>--- a/C4/Output.pm
>+++ b/C4/Output.pm
>@@ -85,7 +85,7 @@ This function returns HTML, without any language dependency.
> =cut
> 
> sub pagination_bar {
>-	my $base_url = (@_ ? shift : $ENV{SCRIPT_NAME} . $ENV{QUERY_STRING}) or return;
>+    my $base_url = (@_ ? shift : return);
>     my $nb_pages       = (@_) ? shift : 1;
>     my $current_page   = (@_) ? shift : undef;	# delay default until later
>     my $startfrom_name = (@_) ? shift : 'page';
>diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
>index 057f30f..26d868b 100755
>--- a/acqui/neworderbiblio.pl
>+++ b/acqui/neworderbiblio.pl
>@@ -148,7 +148,7 @@ $template->param(
>     resultsloop          => \@results,
>     total                => $total_hits,
>     query                => $query,
>-    pagination_bar       => pagination_bar( "$ENV{'SCRIPT_NAME'}?q=$query&booksellerid=$booksellerid&basketno=$basketno&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
>+    pagination_bar       => pagination_bar( "/cgi-bin/koha/acqui/neworderbiblio.pl?q=$query&booksellerid=$booksellerid&basketno=$basketno&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
> );
> 
> # BUILD THE TEMPLATE
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 15005: 43383 | 43387 | 43388 | 43389 | 43443 | 43444 | 43447 | 43448 | 43449 | 43451 | 43452 | 43453 | 43454 | 43455 | 43484 | 43534 | 43535 | 43536 | 43537