From f6c2eedddab9e905d647db1d0f87455959540af7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 18 Jul 2019 13:05:48 +0000 Subject: [PATCH] Bug 23328: Some check-in messages should be dismissable There are several cases where the check-in process displays a modal asking for confirmation. There are several cases where confirming or dismissing the modal unnecessarily reloads the page. In cases where no server-side action is necessary, the modal should be dismissed without submitting a form. To test, apply the patch and go to Circulation -> Check in With AutomaticItemReturn enabled and AllowReturnToBranch set to "any library," - Check in an item which belongs at another library and is not already in-transit. In the confirmation modal which appears, clicking the "OK" button should close the modal without reloading the page. - Check in another item from anther branch. In the confirmation modal clicking the "Print slip" button should trigger a pop-up window for printing a slip but the modal should be dismissed without reloading the page. - Check in an item which is already in-transit to another branch. In the confirmation modal, clicking either the "OK" or "Print transfer slip" buttons should dismiss the modal without reloading the page. - Clicking the "Cancel transfer" button should work as before: The page reloads and the transfer is canceled. With AutomaticItemReturn disabled, - Check in an item belonging to another library. The confirmation modal should ask you whether you want to "Transfer now?" Clicking "No" should dismiss the modal without reloading the page. The other options should reload the page and initiate the transfer. With AllowReturnToBranch set to "only the library the item is from," - Check in an item belonging to another library. You should see a "Cannot check in" modal. Clicking the "OK" button should close the modal without reloading the page. Signed-off-by: Maryse Simard Signed-off-by: Nick Clemens --- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 510d4b911a..8619258484 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -195,7 +195,7 @@

- +
@@ -222,23 +222,9 @@
-
- - [% FOREACH inputloo IN inputloop %] - - - - [% END %] -
+ -
- - [% FOREACH inputloo IN inputloop %] - - - - [% END %] -
+
@@ -421,10 +407,11 @@
[% IF !transfer %] - + + [% ELSE %] - - + + [% END %] -- 2.11.0