From 3ce12f3b5fef6986905447d130b630e3472bc0fe Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 18 Oct 2021 16:43:37 +0000 Subject: [PATCH] Bug 29060: Use modal for suspending holds until a date from the holds page This patch modifies the way suspensions are handled when viewing the list of holds on a particular title. In particular, when AutoResumeSuspendedHolds is enabled the "suspend until" form field is hidden until the suspend button is clicked, when a modal window appears. This is consistent with the way it works when working with the list of holds on a patron record. The patch also converts the hold deletion button from an "X" image to a more-standard "Delete" button. To test, apply the patch and make sure AutoResumeSuspendedHolds is enabled. - Locate a title in the catalog with multiple holds. - View the holds on that title. In the list of holds you should see "Delete" and "Suspend" buttons in the last two columns of the tabel of holds. - Test that the "Delete" button works correctly, - Test the "Suspend" button. Clicking it should trigger a modal window where you can set a date for the hold to resume. - Submitting the form with a date should result in the page reloading and showing the hold as suspended until that date. - Submitting hte form without a date should result in the page reloading and showing the hold as suspended. - Test that the "Resume" button works to remove the suspension. - Disable AutoResumeSuspendedHolds. Now when you click the "Suspend" button you should not see the modal. The page should reload and the hold should be suspended without a resume date. --- .../prog/en/modules/reserve/request.tt | 58 +++++++++---------- 1 file changed, 28 insertions(+), 30 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 ed413af2c3..a37936e629 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -1067,6 +1067,33 @@ + + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'calendar.inc' %] @@ -1148,7 +1175,7 @@ [% END %] [% IF AutoResumeSuspendedHolds %] - $(".suspend_until_datepicker").flatpickr({ + $(".suspend-until").flatpickr({ minDate: new Date().fp_incr(1) /* Require that "until date" be in the future */ }); [% END %] @@ -1672,35 +1699,6 @@ return false; }); - $("body").append("\ - \ - "); - $(".hold-suspend, .hold-resume").on( "click", function(e) { e.preventDefault(); var id = $(this).data("reserve-id") -- 2.20.1