From c15889154eb9cf24f91f7ae3dc56fd7a2abe3fab Mon Sep 17 00:00:00 2001 From: Kyle M Hall <kyle@bywatersolutions.com> Date: Wed, 27 Jul 2016 18:00:53 +0000 Subject: [PATCH] Bug 16988 - Suspending a hold with AutoResumeSuspendedHolds disabled results in error iUnless AutoResumeSuspendedHolds is enabled, attempting to suspend a hold from reserve/request.pl results in the following error: The given date (undefined) does not match the date format (us) at /home/vagrant/kohaclone/Koha/DateUtils.pm line 152. Test Plan: 1) Enable SuspendHoldsIntranet 2) Disable AutoResumeSuspendedHolds 3) Attempt to suspend or unsuspend a hold 4) Note the error 5) Apply this patch 6) Repeat step 3 7) The hold should suspend or resume correctly Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Megan Wianecki <mwianecki@mtpl.org> --- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 d35ce1a..ba53b3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -809,9 +809,11 @@ function checkMultiHold() { <input type="button" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&reserve_id=[% reserveloo.reserve_id %]&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&date=[% reserveloo.date %]&suspend_until=' + $('#suspend_until_[% reserveloo.reserve_id %]').val()" /> [% IF AutoResumeSuspendedHolds %] - <label for="suspend_until_[% reserveloo.reserve_id %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label> - <input name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" size="10" readonly="readonly" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" /> - <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.reserve_id %]').value='';">Clear date</a> + <label for="suspend_until_[% reserveloo.reserve_id %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label> + <input name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" size="10" readonly="readonly" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" /> + <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.reserve_id %]').value='';">Clear date</a> + [% ELSE %] + <input type="hidden" name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" value=""/> [% END %] [% ELSE %] <input type="hidden" name="suspend_until" value="" /> -- 2.1.4