From e61c1e0810528cdaf1db99a4ec70bd96e607021a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 26 Apr 2013 13:59:18 +0200 Subject: [PATCH] Bug 10044: Remove duplicate pagination on the pending orders page. Test plan: Check that there is just one pagination on the pending orders page. Signed-off-by: Mathieu Saby Signed-off-by: Katrin Fischer Works and deletes the old pagination that was replaced by datatables. Signed-off-by: Jared Camins-Esakov (cherry picked from commit 7b0b6e32d1462fab10257769c417f014b0819135) Signed-off-by: Jared Camins-Esakov --- acqui/parcel.pl | 40 +------------------ .../prog/en/modules/acqui/parcel.tt | 19 +-------- 2 files changed, 3 insertions(+), 56 deletions(-) diff --git a/acqui/parcel.pl b/acqui/parcel.pl index 15578a912f..8e82283279 100755 --- a/acqui/parcel.pl +++ b/acqui/parcel.pl @@ -136,10 +136,6 @@ my $datereceived = C4::Dates->new(); my $code = $input->param('code'); my @rcv_err = $input->param('error'); my @rcv_err_barcode = $input->param('error_bc'); -my $startfrom=$input->param('startfrom'); -my $resultsperpage = $input->param('resultsperpage'); -$resultsperpage = 20 unless ($resultsperpage); -$startfrom=0 unless ($startfrom); @@ -281,40 +277,7 @@ if(!defined $invoice->{closedate}) { my $budget = GetBudget( $line{budget_id} ); $line{budget_name} = $budget->{'budget_name'}; - push @loop_orders, \%line if ($i >= $startfrom and $i < $startfrom + $resultsperpage); - } - - my $count = $countpendings; - - if ($count>$resultsperpage){ - my $displaynext=0; - my $displayprev=$startfrom; - if(($count - ($startfrom+$resultsperpage)) > 0 ) { - $displaynext = 1; - } - - my @numbers = (); - for (my $i=1; $i<$count/$resultsperpage+1; $i++) { - my $highlight=0; - ($startfrom/$resultsperpage==($i-1)) && ($highlight=1); - push @numbers, { number => $i, - highlight => $highlight , - startfrom => ($i-1)*$resultsperpage}; - } - - my $from = $startfrom*$resultsperpage+1; - my $to; - if($count < (($startfrom+1)*$resultsperpage)){ - $to = $count; - } else { - $to = (($startfrom+1)*$resultsperpage); - } - $template->param(numbers=>\@numbers, - displaynext=>$displaynext, - displayprev=>$displayprev, - nextstartfrom=>(($startfrom+$resultsperpage<$count)?$startfrom+$resultsperpage:$count), - prevstartfrom=>(($startfrom-$resultsperpage>0)?$startfrom-$resultsperpage:0) - ); + push @loop_orders, \%line; } $template->param( @@ -337,7 +300,6 @@ $template->param( book_foot_loop => \@book_foot_loop, totalprice => sprintf($cfstr, $totalprice), totalquantity => $totalquantity, - resultsperpage => $resultsperpage, (uc(C4::Context->preference("marcflavour"))) => 1, total_quantity => $total_quantity, total_gste => sprintf( "%.2f", $total_gste ), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index fae84736bb..415c7e801c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -240,23 +240,8 @@ [% END %] - [% ELSE %]There are no pending orders.[% END %] -
- - [% IF ( displayprev ) %] - << Previous - [% END %] - [% FOREACH number IN numbers %] - [% IF ( number.highlight ) %] - [% number.number %] - [% ELSE %] - [% number.number %] - [% END %] - [% END %] - [% IF ( displaynext ) %] - Next >> - [% END %] -
+ + [% ELSE %]There are no pending orders.[% END %] [% ELSE %]

-- 2.39.5