Attachment 27353 Details for Bug 11703 – Bug 11703 [QA Followup]

[patch] Bug 11703 [QA Followup]

Bug-11703-QA-Followup.patch (text/plain), 3.93 KB, created by Kyle M Hall (khall) on 2014-04-21 16:15:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2014-04-21 16:15:38 UTC

Size: 3.93 KB

patch

obsolete

>From 124f1ef24516bd57a6d010b0c800439f3c8df283 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>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 += "<span class='renewals-disabled'>"
>+                                + NOT_RENEWABLE_TOO_SOON
>+                                + "</span>";
>+
>+                        span_style = "display: none";
>+                        span_class = "renewals-allowed";
>                     } else {
>                         content += "<span class='renewals-disabled'>"
>                                 + 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 @@
> 
>             <p>The <a href="http://www.openjs.com/scripts/events/keyboard_shortcuts/">OpenJS keyboard shortcuts library</a>
>                by Binny V A is licensed under the BSD license.</p>
>+
>+            <h2>jquery.dataTables.grouping.js</h2>
>+            <p>The <a href="https://code.google.com/p/jquery-datatables-row-grouping/">jquery.dataTables.grouping.js</a>
>+               plugin by Jovan Popovic is licensed under the BSD and GPL v2 license.</p>
>         </div>
> 
>         <div id="translations">
>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

Actions: View | Diff | Splinter Review

Attachments on bug 11703: 25105 | 25110 | 25111 | 25213 | 25217 | 25218 | 25220 | 25221 | 25261 | 25262 | 25263 | 25264 | 25271 | 25272 | 25289 | 25290 | 25292 | 25390 | 25391 | 25986 | 25987 | 25988 | 25989 | 25990 | 25991 | 25992 | 25993 | 25994 | 25995 | 25996 | 25997 | 25998 | 25999 | 26081 | 26085 | 26115 | 26131 | 26158 | 26160 | 26241 | 26986 | 26990 | 26991 | 27102 | 27241 | 27338 | 27339 | 27340 | 27341 | 27342 | 27349 | 27350 | 27353 | 27354 | 27356 | 27548 | 27610 | 27717 | 27718 | 27745 | 27746 | 27750 | 27751 | 28025 | 28026 | 28027 | 28028 | 28029 | 29195 | 29196 | 29197 | 29198 | 29199 | 29279 | 29280 | 29281 | 29282 | 29283 | 29284 | 29419 | 29420 | 29432 | 29433 | 29434 | 29438 | 29439 | 29440 | 29444 | 29445 | 29446 | 29447 | 29448 | 29449 | 29450 | 29451 | 29452 | 29453 | 29454 | 29472 | 29473 | 29474 | 29475 | 29476 | 29477 | 29478 | 29479 | 29480 | 29493 | 30228