From a6d6b953e41641e9bfcfa74598a58bf9d5039743 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 27 Jul 2016 18:00:53 +0000 Subject: [PATCH] Bug 16988 - Suspending a hold with AutoResumeSuspendedHolds disabled results in error MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Megan Wianecki Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher (cherry picked from commit 91bc9451d0378d65100c828776b09395e4c88199) Signed-off-by: Frédéric Demians (cherry picked from commit 3810c29f61ebcd815066f1be2abc08cbb2bdc0aa) Signed-off-by: Julian Maurice --- .../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 bafac15a46..f2366edb25 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -822,9 +822,11 @@ function checkMultiHold() { [% IF AutoResumeSuspendedHolds %] - - - Clear date + + + Clear date + [% ELSE %] + [% END %] [% ELSE %] -- 2.39.5