Attachment 32758 Details for Bug 10446 – Bug 10446 - Follow up fix

[patch] Bug 10446 - Follow up fix

Bug-10446---Follow-up-fix.patch (text/plain), 2.14 KB, created by Mark Tompsett on 2014-10-26 04:41:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2014-10-26 04:41:12 UTC

Size: 2.14 KB

patch

obsolete

>From cc25fd9663ae069c41fc47516a13449dbb668781 Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Mon, 28 Jul 2014 16:49:52 -0400
>Subject: [PATCH] Bug 10446 - Follow up fix
>
>As per comment #11 by Jonathan Druart, I just fixed the items
>in question. Plus, I noted a typographical error in the
>updatedatabase.pl message (10466 vs. 10446)
>
>TEST PLAN
>---------
>1) Apply the patch
>2) Ensure the Circulation system preference, AllowOfflineCirculation,
>    is enabled.
>3) Home -> Circulation -> Built-in offline circulation interface
>---
> circ/offline.pl                                    |    4 ++--
> .../intranet-tmpl/prog/en/modules/circ/offline.tt  |    2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/circ/offline.pl b/circ/offline.pl
>index ebc161b..8f553bf 100755
>--- a/circ/offline.pl
>+++ b/circ/offline.pl
>@@ -36,6 +36,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
> 
> $template->{'VARS'}->{'AllowOfflineCirculation'} =
>   C4::Context->preference('AllowOfflineCirculation');
>-$template->{'VARS'}->{'maxoutstanding'} =
>-  C4::Context->preference('maxoutstanding') || 0;
>+$template->{'VARS'}->{'FeesBlockHoldsAmount'} =
>+  C4::Context->preference('FeesBlockHoldsAmount') || 0;
> output_html_with_http_headers $query, $cookie, $template->output;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>index b8a679d..064331b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>@@ -339,7 +339,7 @@ function checkPatronAlerts(cardnumber, patron) {
>         if (new Date(patron.dateexpiry) < new Date()) {
>             alerts.push(ALERT_PATRON_EXPIRED.format($.datepicker.formatDate(dateformat, new Date(patron.dateexpiry))));
>         }
>-        if (parseInt(patron.fine) > [% maxoutstanding %]) {
>+        if (parseInt(patron.fine) > [% FeesBlockHoldsAmount %]) {
>             alerts.push(ALERT_PATRON_FINE_OVER_LIMIT.format(patron.fine));
>         } else if (parseInt(patron.fine) > 0) {
>             alerts.push(ALERT_PATRON_FINE.format(patron.fine));
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 10446: 18846 | 19903 | 26618 | 30239 | 30240 | 30241 | 32757 | 32758