From 38c8925c4e99a4046e1a4b791962eccd75ab1a17 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 25 Apr 2013 16:57:07 +0200 Subject: [PATCH] [PASSED QA] Bug 10725: Add filters on the pending orders table Since the parcel.pl script get *all* pending orders, there is no reason not to display all of them. Like that, DataTable manages pagination and sorting correctly (on all data). This patch adds filters on the table header (using columnFilter). Test plan: Try filters on the left of the screen and filters on the table header. Signed-off-by: Pierre Angot Signed-off-by: Katrin Fischer Passes all tests and QA script. Searching and sorting the table works correctly. Larger result sets are a performance problem on this page, I have filed bug 10595 for that. --- acqui/parcel.pl | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 59 +++++++++++++++----- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/acqui/parcel.pl b/acqui/parcel.pl index 028e957..4a43c38 100755 --- a/acqui/parcel.pl +++ b/acqui/parcel.pl @@ -201,7 +201,7 @@ for my $item ( @parcelitems ) { push @book_foot_loop, map { $_ } values %foot; my @loop_orders = (); -if(!defined $invoice->{closedate}) { +unless( defined $invoice->{closedate} ) { my $pendingorders; if($input->param('op') eq "search"){ my $search = $input->param('summaryfilter') || ''; 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 250cc96..fef72dc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -4,6 +4,7 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'greybox.inc' %]