Bugzilla – Attachment 170651 Details for
Bug 35402
Update the OPAC and staff interface to Bootstrap 5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35402: (follow-up) Change a checkin form from POST to GET
Bug-35402-follow-up-Change-a-checkin-form-from-POS.patch (text/plain), 5.96 KB, created by
Owen Leonard
on 2024-08-23 16:12:27 UTC
(
hide
)
Description:
Bug 35402: (follow-up) Change a checkin form from POST to GET
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2024-08-23 16:12:27 UTC
Size:
5.96 KB
patch
obsolete
>From 15ce9327b7be05eaa7bec685ab30b3840dce18b6 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 23 Aug 2024 15:29:39 +0000 >Subject: [PATCH] Bug 35402: (follow-up) Change a checkin form from POST to GET > >If you have AllowReturnToBranch enabled and you check in an item which >is disallowed by the preference (returned at the wrong branch, for >instance) You get a "Connot check in" modal. > >Previously clicking the "OK" button in this form triggered JS which is >supposed to submit a form. However, all the button needs to do is >dismiss the modal. The form and the "approve" class on the button are >removed by this patch. > >NOTE: This patch contains indentation changes. > >To test, apply the patch and set the AllowReturnToBranch system >preference to "only at the library that the item is from." > >- Locate an item belonging to another library and check it out to a > patron. >- Check in the item. >- You should see a modal confirmation, "Cannot check in". >- Clicking the "OK" button should dismiss the modal window without > triggering a reload of the page. >--- > .../prog/en/modules/circ/returns.tt | 56 +++++++++---------- > 1 file changed, 27 insertions(+), 29 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 197ad48dd2..74c2e23570 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -540,35 +540,33 @@ > <div id="wrong-branch-modal" tabindex="-1" class="modal modal-lg block audio-alert-action block" data-bs-backdrop="static" data-bs-keyboard="false"> > <div class="modal-dialog"> > <div class="modal-content"> >- <form method="post" action="returns.pl" name="mainform" id="mainform"> >- <div class="modal-header"> >- <h1 class="modal-title"> >- Cannot check in >- </h1> >- </div> >- <div class="modal-body"> >- <p> >- <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]"> >- [% item.barcode | html %]: [% title | html %] >- </a> >- </p> >- <p> >- <strong> >- NOT CHECKED IN >- </strong> >- </p> >- <p> >- This item must be checked in at following library: >- <strong> >- [% Branches.GetName( rightbranch ) | html %] >- </strong> >- </p> >- [% INCLUDE all_checkin_messages %] >- </div> <!-- /.modal-body --> >- <div class="modal-footer"> >- <button type="button" data-bs-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button> >- </div> >- </form> <!-- /#mainform --> >+ <div class="modal-header"> >+ <h1 class="modal-title"> >+ Cannot check in >+ </h1> >+ </div> >+ <div class="modal-body"> >+ <p> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]"> >+ [% item.barcode | html %]: [% title | html %] >+ </a> >+ </p> >+ <p> >+ <strong> >+ NOT CHECKED IN >+ </strong> >+ </p> >+ <p> >+ This item must be checked in at following library: >+ <strong> >+ [% Branches.GetName( rightbranch ) | html %] >+ </strong> >+ </p> >+ [% INCLUDE all_checkin_messages %] >+ </div> <!-- /.modal-body --> >+ <div class="modal-footer"> >+ <button type="button" data-bs-dismiss="modal" class="btn btn-primary"><i class="fa fa-check"></i> OK</button> >+ </div> > </div> <!-- /.modal-content --> > </div> <!-- /.modal-dialog --> > </div> <!-- /#wrong-branch-modal --> >-- >2.39.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35402
: 170651 |
170709
|
170710
|
170711
|
170712
|
170714
|
170715
|
170716
|
170717
|
170745
|
170768
|
170877
|
170905
|
170962
|
170963
|
171176