From ff9fb50341b252129ede4fcb24b8ec17430f44bc Mon Sep 17 00:00:00 2001 From: Luke Honiss Date: Thu, 19 Jan 2017 02:55:31 +0000 Subject: [PATCH] [SIGNED-OFF] Bug 11450: Hold Request Confirm Deletion ==TEST PLAN== 1) Go to an item with a hold and click on the holds tab on the left 2) Click the red 'X' 3) The hold will be deleted immediately 4) Apply patch 5) Return to an item with a hold and click the 'X' 6) There will now be a confirmation dialog 7) Click cancel and the dialog will disappear and the hold will not be deleted 8) Click OK and the hold will be deleted Signed-off-by: Owen Leonard Made one minor correction while signing off: Removed some stray spaces from inside a link. --- .../prog/en/modules/reserve/request.tt | 59 ++++++++++++---------- 1 file changed, 32 insertions(+), 27 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 12b4e1b..bf1a484 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -168,6 +168,11 @@ function checkMultiHold() { $("#" + fieldID).val(""); }); + // Confirm cancelation of hold + $(".cancel-hold").on("click",function(e) { + return confirmDelete(MSG_CONFIRM_DELETE_HOLD); + }); + [% UNLESS ( borrowernumber || borrowers || noitems ) %] [% IF ( CircAutocompl ) %] @@ -855,38 +860,38 @@ function checkMultiHold() { [% END %] - - Cancel - - - - [% IF SuspendHoldsIntranet %] - - [% UNLESS ( reserveloo.found ) %] - - - [% IF AutoResumeSuspendedHolds %] - - - Clear date - [% ELSE %] - - [% END %] - [% ELSE %] - - [% END %] - - [% END # IF SuspendHoldsIntranet %] + + Cancel + + + + [% IF SuspendHoldsIntranet %] + + [% UNLESS ( reserveloo.found ) %] + + + [% IF AutoResumeSuspendedHolds %] + + + Clear date + [% ELSE %] + + [% END %] +[% ELSE %] + +[% END %] + + [% END # IF SuspendHoldsIntranet %] - + - [% END %] - - [% END %] +[% END %] + +[% END %] [% END %]
- +
-- 2.1.4