From 6eb9176cbf4613830f9d90a640e18efdb9871a53 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 3 Apr 2013 15:31:08 +0200 Subject: [PATCH] Bug 9984: Remove server-side sort on the hold ratios table JS is a requirement for the staff client, so the sort link on header is useless. Test plan: Check that there is no regression (sort, data, etc.) on the hold ratios table. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Tested on top of patch for bug 9459. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov (cherry picked from commit 91155470ba3cbee869368d6904cb3da4a0197768) Signed-off-by: Jared Camins-Esakov --- circ/reserveratios.pl | 28 ++------ .../prog/en/modules/circ/reserveratios.tt | 68 ++++++++----------- 2 files changed, 32 insertions(+), 64 deletions(-) diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl index 209a09e758..91d1f6a266 100755 --- a/circ/reserveratios.pl +++ b/circ/reserveratios.pl @@ -32,7 +32,6 @@ use C4::Debug; use C4::Biblio qw/GetMarcBiblio GetRecordValue GetFrameworkCode/; my $input = new CGI; -my $order = $input->param('order') || ''; my $startdate = $input->param('from'); my $enddate = $input->param('to'); my $ratio = $input->param('ratio'); @@ -72,7 +71,7 @@ if ($ratio <= 0) { } my $dbh = C4::Context->dbh; -my ($sqlorderby, $sqldatewhere) = ("",""); +my $sqldatewhere = ""; $debug and warn format_date_in_iso($startdate) . "\n" . format_date_in_iso($enddate); my @query_params = (); if ($startdate) { @@ -84,23 +83,6 @@ if ($enddate) { push @query_params, format_date_in_iso($enddate); } -if ($order eq "biblio") { - $sqlorderby = " ORDER BY biblio.title, holdingbranch, listcall, l_location "; -} elsif ($order eq "callnumber") { - $sqlorderby = " ORDER BY listcall, holdingbranch, l_location "; -} elsif ($order eq "itemcount") { - $sqlorderby = " ORDER BY itemcount, reservecount "; -} elsif ($order eq "itype") { - $sqlorderby = " ORDER BY l_itype, holdingbranch, listcall "; -} elsif ($order eq "location") { - $sqlorderby = " ORDER BY l_location, holdingbranch, listcall "; -} elsif ($order eq "reservecount") { - $sqlorderby = " ORDER BY reservecount DESC "; -} elsif ($order eq "branch") { - $sqlorderby = " ORDER BY holdingbranch, l_location, listcall "; -} else { - $sqlorderby = " ORDER BY reservecount DESC "; -} my $strsth = "SELECT reservedate, reserves.borrowernumber as borrowernumber, @@ -126,17 +108,17 @@ my $strsth = FROM reserves LEFT JOIN items ON items.biblionumber=reserves.biblionumber LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber - WHERE -notforloan = 0 AND damaged = 0 AND itemlost = 0 AND wthdrawn = 0 + WHERE + notforloan = 0 AND damaged = 0 AND itemlost = 0 AND wthdrawn = 0 $sqldatewhere "; if (C4::Context->preference('IndependantBranches')){ - $strsth .= " AND items.holdingbranch=? "; + $strsth .= " AND items.holdingbranch=? "; push @query_params, C4::Context->userenv->{'branch'}; } -$strsth .= " GROUP BY reserves.biblionumber " . $sqlorderby; +$strsth .= " GROUP BY reserves.biblionumber ORDER BY reservecount DESC"; $template->param(sql => $strsth); my $sth = $dbh->prepare($strsth); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt index 8a521939f6..d55382e253 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -8,12 +8,11 @@