From 124f1ef24516bd57a6d010b0c800439f3c8df283 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 21 Apr 2014 12:13:03 -0400 Subject: [PATCH] Bug 11703 [QA Followup] * Add plugin to about * fix relatives' checkouts * add too_many string * remove dead syspref from db --- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ .../intranet-tmpl/prog/en/includes/strings.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 7 +++++++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 ++++ svc/checkouts.pl | 2 +- 5 files changed, 23 insertions(+), 1 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 8917081..6a8dbff 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8202,6 +8202,16 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.15.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + DELETE FROM systempreferences WHERE variable = 'UseTableSortForCirc' + }); + + print "Upgrade to $DBversion done (Bug 11703 - Convert checkouts table to ajax datatable)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc index e22810a..7f49693 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc @@ -13,6 +13,7 @@ var BY = _("by"); var ON_HOLD = _("On hold"); var NOT_RENEWABLE = _("Not renewable"); + var NOT_RENEWABLE_TOO_SOON = _("Cannot renew, renewal is premature"); var OF = _("of"); var RENEWALS_REMAINING = _("renewals remaining"); var HOLD_IS = _("Hold is"); diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js index 8dafc3f..c10958c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js @@ -234,6 +234,13 @@ $(document).ready(function() { span_style = "display: none"; span_class = "renewals-allowed"; + } else if ( oObj.can_renew_error == "too_soon" ) { + content += "" + + NOT_RENEWABLE_TOO_SOON + + ""; + + span_style = "display: none"; + span_class = "renewals-allowed"; } else { content += "" + oObj.can_renew_error diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 1362eb2..cb396e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -513,6 +513,10 @@

The OpenJS keyboard shortcuts library by Binny V A is licensed under the BSD license.

+ +

jquery.dataTables.grouping.js

+

The jquery.dataTables.grouping.js + plugin by Jovan Popovic is licensed under the BSD and GPL v2 license.

diff --git a/svc/checkouts.pl b/svc/checkouts.pl index 1fef393..45c4fd7 100755 --- a/svc/checkouts.pl +++ b/svc/checkouts.pl @@ -97,7 +97,7 @@ if ( @borrowernumber == 1 ) { $sql .= '= ?'; } else { - $sql = ' IN (' . join( ',', ('?') x @borrowernumber ) . ') '; + $sql .= ' IN (' . join( ',', ('?') x @borrowernumber ) . ') '; } push( @parameters, @borrowernumber ); -- 1.7.2.5