Attachment 91583 Details for Bug 23328 – Bug 23328: Some check-in messages should be dismissable

[patch] Bug 23328: Some check-in messages should be dismissable

Bug-23328-Some-check-in-messages-should-be-dismiss.patch (text/plain), 7.42 KB, created by Owen Leonard on 2019-07-18 13:31:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2019-07-18 13:31:55 UTC

Size: 7.42 KB

patch

obsolete

>From db8b072b5659f28277534034940adef179be40af Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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.
>---
> .../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 510d4b911ab..8619258484b 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 @@
>                         </p>
>                     </div>
>                     <div class="modal-footer">
>-                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
>+                        <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
>                     </div>
>                 </form>
>             </div>
>@@ -222,23 +222,9 @@
>                 </div>
>                 <div class="modal-footer">
>                     
>-                    <form method="post" action="returns.pl" name="mainform">
>-                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
>-                        [% FOREACH inputloo IN inputloop %]
>-                            <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
>-                            <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
>-                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
>-                        [% END %]
>-                    </form>
>+                    <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
>                     
>-                    <form method="post" action="returns.pl" name="mainform">
>-                        <button type="submit" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% TransferWaitingAt | html %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
>-                        [% FOREACH inputloo IN inputloop %]
>-                            <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
>-                            <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
>-                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
>-                        [% END %]
>-                    </form>
>+                    <button type="button" data-dismiss="modal" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% TransferWaitingAt | html %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
>                     
>                     <form method="post" action="returns.pl" name="mainform">
>                         <button class="btn btn-default deny" type="submit"><i class="fa fa-times"></i> Cancel transfer</button>
>@@ -421,10 +407,11 @@
>                     <div class="modal-footer">
>                         [% IF !transfer %]
>                         <button type="submit" name="dotransfer" value="Yes" class="btn btn-default approve"><i class="fa fa-check"></i> Yes</button>
>-                        <button type="submit" name="dotransfer" value="Yes" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Yes, print slip</button><button type="submit" class="btn btn-default deny" name="notransfer" value="No"><i class="fa fa-times"></i> No</button>
>+                        <button type="submit" name="dotransfer" value="Yes" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Yes, print slip</button>
>+                        <button type="button" data-dismiss="modal" class="btn btn-default deny" name="notransfer" value="No"><i class="fa fa-times"></i> No</button>
>                         [% ELSE %]
>-                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
>-                        <button type="submit" name="dotransfer" value="Yes" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button>
>+                        <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
>+                        <button type="button" data-dismiss="modal" name="dotransfer" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button>
>                         [% END %]
>                         <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
>                         <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 23328: 91583 | 91671 | 91869