Attachment 56963 Details for Bug 15581 – Bug 15581: Display the generic "schedule for auto renew" message on the checkouts table

[patch] Bug 15581: Display the generic "schedule for auto renew" message on the checkouts table

Bug-15581-Display-the-generic-schedule-for-auto-re.patch (text/plain), 2.63 KB, created by Jonathan Druart on 2016-10-28 16:09:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-10-28 16:09:17 UTC

Size: 2.63 KB

patch

obsolete

>From 27f9c33efe89dedd5c6b6e3d06d4c5db3f977bc7 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 18 Apr 2016 16:33:42 +0100
>Subject: [PATCH] Bug 15581: Display the generic "schedule for auto renew"
> message on the checkouts table
>
>Signed-off-by: Jonathan Field <jonathan.field@ptfs-europe.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc | 1 +
> koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 7 +++++++
> t/db_dependent/Circulation.t | 2 +-
> 3 files changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>index 8289900..6622504 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>@@ -17,6 +17,7 @@
> var NOT_RENEWABLE = _("Not renewable");
> var NOT_RENEWABLE_TOO_SOON = _("No renewal before %s");
> var NOT_RENEWABLE_AUTO_TOO_SOON = _("Scheduled for automatic renewal");
>+ var NOT_RENEWABLE_AUTO_TOO_LATE = _("Scheduled for automatic renewal");
> var NOT_RENEWABLE_AUTO_RENEW = _("Scheduled for automatic renewal");
> var RENEWALS_REMAINING = _("%s of %s renewals remaining");
> var HOLD_IS_SUSPENDED = _("Hold is suspended");
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>index 6d03a06..b8416c6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>@@ -353,6 +353,13 @@ $(document).ready(function() {
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>+ } else if ( oObj.can_renew_error == "auto_too_late" ) {
>+ content += ""
>+ + NOT_RENEWABLE_AUTO_TOO_LATE
>+ + "";
>+
>+ span_style = "display: none";
>+ span_class = "renewals-allowed";
> } else if ( oObj.can_renew_error == "auto_renew" ) {
> content += ""
> + NOT_RENEWABLE_AUTO_RENEW
>diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t
>index fb5dc3f..723c27b 100755
>--- a/t/db_dependent/Circulation.t
>+++ b/t/db_dependent/Circulation.t
>@@ -17,7 +17,7 @@
> 
> use Modern::Perl;
> 
>-use Test::More tests => 89;
>+use Test::More tests => 90;
> 
> BEGIN {
> require_ok('C4::Circulation');
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 15581: 46690 | 46691 | 46692 | 50330 | 50331 | 50332 | 50347 | 50672 | 50673 | 50674 | 50675 | 50742 | 50743 | 50744 | 50745 | 53424 | 53425 | 53426 | 53427 | 55504 | 55505 | 55506 | 55507 | 56746 | 56747 | 56748 | 56749 | 56961 | 56962 | 56963 | 56964 | 56982 | 57034 | 57035 | 57036 | 57037 | 57038