From 82e9bdb37b3ee637bbbe84abc7995995e2b0abd2 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 1 Jul 2013 10:39:06 +0200 Subject: [PATCH] Bug 9811: QA followup - removes 2 tabs - removes mysqlisms - add sort on borrowernotes - fix wrong capitalization - cat => Category Signed-off-by: Katrin Fischer Thx for fixing these! --- C4/Utils/DataTables/Members.pm | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 9 +++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/C4/Utils/DataTables/Members.pm b/C4/Utils/DataTables/Members.pm index 2f99d90..aeb0eba 100644 --- a/C4/Utils/DataTables/Members.pm +++ b/C4/Utils/DataTables/Members.pm @@ -27,7 +27,7 @@ sub search { } my $dbh = C4::Context->dbh; - my $select = "SELECT SQL_CALC_FOUND_ROWS + my $select = "SELECT borrowers.borrowernumber, borrowers.surname, borrowers.firstname, borrowers.address, borrowers.address2, borrowers.city, borrowers.zipcode, borrowers.country, CAST(borrowers.cardnumber AS UNSIGNED) AS cardnumber, borrowers.dateexpiry, @@ -80,7 +80,7 @@ sub search { if @where_strs_or; my $where; - $where = "WHERE " . join (" AND ", @where_strs) if @where_strs; + $where = " WHERE " . join (" AND ", @where_strs) if @where_strs; my $orderby = dt_build_orderby($dt_params); my $limit; @@ -104,9 +104,9 @@ sub search { my $patrons = $sth->fetchall_arrayref({}); # Get the iTotalDisplayRecords DataTable variable - $query = "SELECT FOUND_ROWS()"; + $query = "SELECT COUNT(*) " . $from . ($where ? $where : ""); $sth = $dbh->prepare($query); - $sth->execute; + $sth->execute(@where_args); ($iTotalDisplayRecords) = $sth->fetchrow_array; # Get the iTotalRecords DataTable variable diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc index 722fec8..3172208 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -91,8 +91,8 @@ [% ELSE %] [% END %] [% END %] -

- [% END %] +

+ [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt index b8a7ce0..5aa0009 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -2,6 +2,7 @@ Koha › Patrons [% IF ( searching ) %]› Search results[% END %] [% INCLUDE 'doc-head-close.inc' %] +[% INCLUDE 'datatables-strings.inc' %]