Bugzilla – Attachment 92072 Details for
Bug 23434
Hold confirmation dialog problem if HoldsAutoFill is enabled
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23434: Hold confirmation dialog problem if HoldsAutoFill is enabled
Bug-23434-Hold-confirmation-dialog-problem-if-Hold.patch (text/plain), 24.85 KB, created by
Martin Renvoize (ashimema)
on 2019-08-08 12:00:40 UTC
(
hide
)
Description:
Bug 23434: Hold confirmation dialog problem if HoldsAutoFill is enabled
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2019-08-08 12:00:40 UTC
Size:
24.85 KB
patch
obsolete
>From 1b0e6215a54ea4394d2ab91d9c95427b06083376 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 6 Aug 2019 13:25:24 +0000 >Subject: [PATCH] Bug 23434: Hold confirmation dialog problem if HoldsAutoFill > is enabled > >This patch corrects a problem with hold confirmation dialogs on the >checkin page when the HoldsAutoFill system preference is enabled and the >item being checked in has a hold at another library. > >The confirmation dialog is converted to a modal to match other >confirmation information. > >As part of this process two whole sections of the template have been >removed because they were redundant. > >To test, apply the patch and test the following circumstances both with >HoldsAutoFill enabled AND disabled: > > - A hold for a patron at your library > - A hold for a patron not at your library > - With HoldsAutoFill ON, both the "OK" and "Print slip and confirm" > buttons should dismiss the modal without reloading the page. > - A hold which is already marked 'Waiting' > - An item which needs to be transferred > - An item which has already been transferred > >In all cases the confirmation modal should appear with correct >information. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/modules/circ/returns.tt | 269 +++++++----------- > 1 file changed, 98 insertions(+), 171 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 f93129d147..42d7a19089 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -57,58 +57,69 @@ > [% END %] > > [% IF hold_auto_filled %] >- <div class="dialog alert hold-auto-filled"> >- [% IF ( reservenotes ) %] >- <h4>Notes: [% reservenotes | html %]</h4> >- [% END %] >- <h3>Hold filled for:</h3> >- <ul> >- <li> >- [% INCLUDE 'patron-title.inc' patron=patron %] >- <span class="patron-category"> - [% patron.category.description | html %]</span> >- </li> >- >- [% INCLUDE display_holdpatron_address %] > >- [% IF ( patron.phone ) %] >- <li>[% patron.phone | html %]</li> >- [% END %] >+ <div id="holds-auto-fill" class="modal audio-alert-action" tabindex="-1" role="dialog" aria-labelledby="HoldsAutoFillLabel"> >+ <div class="modal-dialog" role="document"> >+ <div class="modal-content"> >+ <div class="modal-header"> >+ <h3 class="modal-title" id="HoldsAutoFillLabel"> >+ Hold found: >+ <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a> >+ <div class="hold-found-barcode"> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&itemnumber=[% itemnumber | uri %]">[% itembarcode | html %]</a> >+ </div> >+ </h3> >+ </div> >+ <div class="modal-body"> >+ [% IF ( reservenotes ) %] >+ <h4>Notes: [% reservenotes | html %]</h4> >+ [% END %] > >- [% IF ( patron.email ) %] >- <li> >- [% IF ( transfertodo ) %] >- [% patron.email | html %] >+ <h4>Hold for: </h4> >+ <ul> >+ <li> >+ [% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 link_to="circulation_reserves" %] >+ <span class="patron-category"> - [% patron.category.description | html %]</span> >+ </li> >+ [% INCLUDE display_holdpatron_address %] >+ [% IF ( patron.phone ) %] >+ <li>[% patron.phone | html %]</li> >+ [% END %] >+ [% IF ( patron.email ) %] >+ <li> >+ [% IF ( diffbranch ) %] >+ [% patron.email | html %] >+ [% ELSE %] >+ <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a> >+ [% END %] >+ </li> >+ [% END %] >+ [% UNLESS ( diffbranch) %] >+ [% INCLUDE display_bormessagepref %] >+ [% END %] >+ [% IF ( patron.debarred ) %] >+ <li class="error">Patron is RESTRICTED</li> >+ [% END %] >+ [% IF ( patron.gonenoaddress ) %] >+ <li class="error">Patron's address is in doubt</li> >+ [% END %] >+ </ul> >+ [% IF ( diffbranch ) %] >+ <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4> > [% ELSE %] >- <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a> >+ <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4> > [% END %] >- </li> >- [% END %] >- >- [% UNLESS ( transfertodo) %] >- [% INCLUDE display_bormessagepref %] >- [% END %] >- >- [% IF ( patron.debarred ) %] >- <li class="error">Patron is RESTRICTED</li> >- [% END %] >- >- [% IF ( patron.gonenoaddress ) %] >- <li class="error">Patron's address is in doubt</li> >- [% END %] >- </ul> >- >- [% IF ( transfertodo ) %] >- <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4> >- [% ELSE %] >- <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4> >- [% END %] >- >- <a href="#" class="btn btn-default print print-slip"> >- <i class="fa fa-print"></i> Print >- </a> >- </div> <!-- /.hold-auto-filled --> >+ </div> >+ <div class="modal-footer"> >+ <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" class="btn btn-default print print-slip"><i class="fa fa-print"></i> Print slip and continue</button> >+ </div> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+ </div> <!-- /#holds-auto-fill --> > [% END # /IF hold_auto_filled %] > >+ > [% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %] > <div class="dialog alert"> > <strong>Error:</strong> >@@ -213,45 +224,47 @@ > [% END # /IF wrongbranch %] > > <!-- case of a mistake in transfer loop --> >- [% IF WrongTransfer && !transfertodo %] >- <div id="wrong-transfer-modal" class="modal fade audio-alert-action"> >- <div class="modal-dialog"> >- <div class="modal-content"> >- <div class="modal-header"> >- <h3> >- Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %] >- </h3> >- </div> >- <div class="modal-body"> >- <p> >- <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]"> >- [% itembarcode | html %]: [% title | html %] >- </a> >- </p> >- </div> >- <div class="modal-footer"> >- <!-- CONFIRM --> >- <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button> >- <!-- PRINT SLIP --> >- <button type="button" data-dismiss="modal" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&&branchcode=[% TransferWaitingAt | html %]&op=slip"><i class="fa fa-print"></i> Print transfer slip</button> >- <!-- CANCEL TRANSFER --> >- <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> >- <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 %]" /> >- <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" /> >- <input type="hidden" name="canceltransfer" value="1" /> >- [% 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> <!-- /mainform --> >- </div> <!-- /.modal-footer --> >- </div> <!-- /.modal-content --> >- </div> <!-- /.modal-dialog --> >- </div> <!-- /#wrong-transfer-modal --> >- [% END # /IF WrongTransfer && !transfertodo %] >+ [% UNLESS ( hold_auto_filled && diffbranch ) %] >+ [% IF WrongTransfer && !transfertodo %] >+ <div id="wrong-transfer-modal" class="modal fade audio-alert-action"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> >+ <div class="modal-header"> >+ <h3> >+ Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %] >+ </h3> >+ </div> >+ <div class="modal-body"> >+ <p> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]"> >+ [% itembarcode | html %]: [% title | html %] >+ </a> >+ </p> >+ </div> >+ <div class="modal-footer"> >+ <!-- CONFIRM --> >+ <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button> >+ <!-- PRINT SLIP --> >+ <button type="button" data-dismiss="modal" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&&branchcode=[% TransferWaitingAt | html %]&op=slip"><i class="fa fa-print"></i> Print transfer slip</button> >+ <!-- CANCEL TRANSFER --> >+ <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> >+ <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 %]" /> >+ <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" /> >+ <input type="hidden" name="canceltransfer" value="1" /> >+ [% 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> <!-- /mainform --> >+ </div> <!-- /.modal-footer --> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+ </div> <!-- /#wrong-transfer-modal --> >+ [% END # /IF WrongTransfer && !transfertodo %] >+ [% END # /UNLESS hold_auto_filled && diffbranch %] > > [% IF ( found ) %] > [% IF ( waiting ) %] >@@ -346,66 +359,6 @@ > </div> <!-- /#hold-found1 --> > [% END # /IF waiting %] > >- [% IF ( diffbranch ) %] >- <!-- diffbranch --> >- <div id="transfer-needed" class="dialog message audio-alert-action"> >- <h3>Hold needing transfer found</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p> >- <h4>Hold for: </h4> >- <ul> >- <li> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> >- </li> >- [% INCLUDE display_holdpatron_address %] >- [% IF ( patron.phone ) %] >- <li>[% patron.phone | html %]</li> >- [% END %] >- [% IF ( patron.email ) %] >- <li> >- [% IF ( transfertodo ) %] >- [% patron.email | html %] >- [% ELSE %] >- <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a> >- [% END %] >- </li> >- [% END %] >- [% IF ( patron.debarred ) %] >- <li class="error">Patron is RESTRICTED</li> >- [% END %] >- [% IF ( patron.gonenoaddress ) %] >- <li class="error">Patron's address is in doubt</li> >- [% END %] >- </ul> >- >- [% IF ( transfertodo ) %] >- <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4> >- [% ELSE %] >- <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4> >- [% END %] >- >- <form method="post" action="returns.pl" class="confirm"> >- <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm</button> >- <input type="hidden" name="print_slip" value="0" /> >- <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" /> >- <input type="hidden" name="biblionumber" value="[% itembiblionumber | html %]" /> >- <button type="submit" class="print"><i class="fa fa-print"></i> Print slip and continue</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 %] >- <input type="hidden" name="diffBranch" value="[% destbranch | html %]" /> >- <input type="hidden" name="exemptfine" value="[% exemptfine | html %]" /> >- <input type="hidden" name="dropboxmode" value="[% dropboxmode | html %]" /> >- <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire | html %]" /> >- <input type="hidden" name="barcode" value="0" /> >- >- <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 %]" /> >- </form> <!-- /.confirm --> >- </div> <!-- /#transfer-needed --> >- [% END # /IF diffbranch %] >- > [% IF transfer || needstransfer %] > <div id="item-transfer-modal" class="modal fade audio-alert-action"> > <div class="modal-dialog"> >@@ -457,32 +410,6 @@ > </div> <!-- /#item-transfer-modal --> > [% END # /IF transfer || needstransfer %] > >- [% IF ( diffbranch ) %] >- <!-- diffbranch --> >- <h3 class="audio-alert-action">Item consigned:</h3> >- <table> >- <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a></caption> >- <tr> >- <th>Hold for:</th> >- <td>[% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 link_to="circulation_reserves" %]</td> >- </tr> >- </table> >- <form method="post" action="returns.pl"> >- <input type="submit" value="OK" /> >- [% FOREACH inputloo IN inputloop %] >- [% UNLESS ( inputloo.first ) %] >- <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 %] >- [% 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 %]" /> >- <input type="hidden" name="barcode" value="0" /> >- </form> >- [% END # /IF diffbranch %] >- > <!-- case of simple return no issue or transfer but with a reservation --> > [% IF ( reserved ) %] > <!-- reserved --> >-- >2.20.1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=92072">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23434
:
92025
|
92028
|
92072
|
92082
|
92093