From 9720d6684c2deb7207c6f7c1eb920d52fa27066a Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 26 Mar 2014 17:58:46 +0000 Subject: [PATCH] [SIGNED-OFF] Bug 12000: ensure that hold resumption dates can be set only to future dates Content-Type: text/plain; charset="utf-8" This patch makes the datepickers for the hold resumption date (AKA the hold suspend until date) field only permit dates in the future to be selected in the staff interface checkout page and hold list pages. This makes these pages consistent with the OPAC and the patron details page in the staff interface. To test: [1] Ensure that AutoResumeSuspendedHolds and SuspendHoldsIntranet are enabled. [2] Go to the checkout page for a patron that has at least one hold request. [3] Verify that the datepicker for the hold suspend until date field only permits choosing a date in the future. [4] Go to the page listing hold requests for a title. [5] Verify that the datepicker for the hold suspend until date fields only permit choosing a date in the future. Signed-off-by: Galen Charlton Signed-off-by: Owen Leonard --- .../prog/en/modules/circ/circulation.tt | 3 +++ .../prog/en/modules/reserve/request.tt | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index e667bc3..7c611dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -94,6 +94,9 @@ var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); } ).attr( 'checked', false ); [% END %] [% END %] + [% IF AutoResumeSuspendedHolds %] + $("#suspend_until").datepicker("option", "minDate", 1); // require that hold suspended until date is after today + [% END %] }); //]]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 93c005a..1f6bd82 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -19,6 +19,12 @@ var override_items = {[% FOREACH bibitemloo IN bibitemloop %][% FOREACH itemloo }; var MSG_NO_ITEMS_AVAILABLE = _("A hold cannot be requested on any of these items."); +$(document).ready(function() { + [% IF AutoResumeSuspendedHolds %] + $(".suspend_until_datepicker").datepicker("option", "minDate", 1); + [% END %] +}); + function check() { var msg = ""; var count_reserv = 0; @@ -740,7 +746,7 @@ function checkMultiHold() { [% IF AutoResumeSuspendedHolds %] - + Clear date [% END %] [% ELSE %] -- 1.7.9.5