From 115d7fa6a7c12caf3b5a9a9a1b6423b71cc6313f Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 19 Jul 2017 15:57:52 -0300 Subject: [PATCH] Bug 15486: Make circ rules UI handle holds_per_day This patch makes the staff UI correctly handle the holds_per_day configuration. --- admin/smart-rules.pl | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl index 6a55b7bde4..b72a70a707 100755 --- a/admin/smart-rules.pl +++ b/admin/smart-rules.pl @@ -143,6 +143,7 @@ elsif ($op eq 'add') { $no_auto_renewal_after_hard_limit = output_pref( { dt => $no_auto_renewal_after_hard_limit, dateonly => 1, dateformat => 'iso' } ) if ( $no_auto_renewal_after_hard_limit ); my $reservesallowed = $input->param('reservesallowed'); my $holds_per_record = $input->param('holds_per_record'); + my $holds_per_day = $input->param('holds_per_day'); my $onshelfholds = $input->param('onshelfholds') || 0; $maxissueqty =~ s/\s//g; $maxissueqty = undef if $maxissueqty !~ /^\d+/; @@ -182,6 +183,7 @@ elsif ($op eq 'add') { no_auto_renewal_after_hard_limit => $no_auto_renewal_after_hard_limit, reservesallowed => $reservesallowed, holds_per_record => $holds_per_record, + holds_per_day => $holds_per_day, issuelength => $issuelength, lengthunit => $lengthunit, hardduedate => $hardduedate, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 0283d80fe9..4c0402dc25 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -187,7 +187,8 @@ $(document).ready(function() { Automatic renewal No automatic renewal after No automatic renewal after (hard limit) - Holds allowed (count) + Holds allowed (total) + Holds allowed (daily) Holds per record (count) On shelf holds allowed Item level holds @@ -270,6 +271,7 @@ $(document).ready(function() { [% rule.no_auto_renewal_after %] [% rule.no_auto_renewal_after_hard_limit %] [% rule.reservesallowed %] + [% rule.holds_per_day %] [% rule.holds_per_record %] [% IF rule.onshelfholds == 1 %] @@ -361,6 +363,7 @@ $(document).ready(function() {
[% INCLUDE 'date-format.inc' %]
+