Bugzilla – Attachment 62649 Details for
Bug 18490
Transfer message confusing, cancel button missing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[Bug 18490] Change transfer message/show cancel
Bug-18490-Change-transfer-messageshow-cancel.patch (text/plain), 16.62 KB, created by
Christopher Brannon
on 2017-04-25 00:13:41 UTC
(
hide
)
Description:
[Bug 18490] Change transfer message/show cancel
Filename:
MIME Type:
Creator:
Christopher Brannon
Created:
2017-04-25 00:13:41 UTC
Size:
16.62 KB
patch
obsolete
>From 3a9aadf44e4c7fd7c0bf9b8324cd2809004d4d03 Mon Sep 17 00:00:00 2001 >From: Christopher Brannon <cbrannon@cdalibrary.org> >Date: Mon, 24 Apr 2017 23:52:14 +0000 >Subject: [PATCH] [Bug 18490] Change transfer message/show cancel > >This patch changes the transfer message and shows the cancel button on >the first checkin. I've also cleaned up some formatting in the code. > >To test: > >Test A: >1) Check in an item at a library other than its homebranch. > >Test B: >2) Place an item on hold to be picked up at another library. >3) Check in the item at a library other than the home branch or pickup >loccation. > >Test C: >4) Add item to a rotating collection. >5) Transfer collection to another library. >6) Check in the item to trigger the transfer. > >7) On each test, notice the phrase "Please transfer item to:" and notice >that the Cancel transfer button does not appear on the first checkin. > >8) Apply patch. >9) Repeat steps 1-6. >10) On each test notice the phrase is now "Transferring item to:" and >notice that the Cancel transfer button now shows after the first >checkin. >--- > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 163 +++++++++++---------- > 1 file changed, 83 insertions(+), 80 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 ba284bc..72739d1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -183,7 +183,7 @@ $(document).ready(function () { > > [% IF ( collectionItemNeedsTransferred ) %] > <div id="rotating-collection" class="dialog message"> >- <h3>Please transfer item to: [% Branches.GetName( collectionBranch ) %]</h3> >+ <h3>Transferring item to: [% Branches.GetName( collectionBranch ) %]</h3> > <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> > <p>This item is part of a rotating collection.</p> > <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% collectionBranch %]&op=slip"><i class="fa fa-print"></i> Print slip</button></p> >@@ -229,32 +229,36 @@ $(document).ready(function () { > [% IF ( WrongTransfer ) %] > <div id="return2" class="dialog message"> > <!-- WrongTransfer --> >- <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) %]</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> >+ <h3>Transferring item to: [% Branches.GetName( TransferWaitingAt ) %]</h3> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> > <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% TransferWaitingAt %]&op=slip"><i class="fa fa-print"></i> Print transfer slip</button> > <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button> >-[% IF ( wborcnum ) %]<h5>Hold for:</h5> >- <ul> >- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]"> >- [% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li> >- [% INCLUDE display_holdpatron_address %] >- [% IF ( wborphone ) %]<li>[% wborphone %]</li>[% END %] >- [% IF ( wboremail ) %]<li><a id="boremail" href="mailto:[% wboremail %]">[% wboremail %]</a></li>[% END %] >- </ul> >- >- <form method="post" action="returns.pl" class="confirm"> >- <input type="hidden" name="WT-itemNumber" value="[% WrongTransferItem %]" /> >- <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt %]" /> >- <input type="hidden" name="WT-From" value="[% wtransfertFrom %]" /> >- <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="[% borrowernumber %]" /> >- <input type="hidden" name="biblionumber" value="[% biblionumber %]" /> >- <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();"><i class="fa fa-print"></i> Print slip and confirm</button> >- <input type="hidden" name="return_date_override" value="[% return_date_override %]" /> >- <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" /> >- </form> >- [% END %]</div> >+ [% IF ( wborcnum ) %]<h5>Hold for:</h5> >+ <ul> >+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li> >+ [% INCLUDE display_holdpatron_address %] >+ [% IF ( wborphone ) %] >+ <li>[% wborphone %]</li> >+ [% END %] >+ [% IF ( wboremail ) %] >+ <li><a id="boremail" href="mailto:[% wboremail %]">[% wboremail %]</a></li> >+ [% END %] >+ </ul> >+ >+ <form method="post" action="returns.pl" class="confirm"> >+ <input type="hidden" name="WT-itemNumber" value="[% WrongTransferItem %]" /> >+ <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt %]" /> >+ <input type="hidden" name="WT-From" value="[% wtransfertFrom %]" /> >+ <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="[% borrowernumber %]" /> >+ <input type="hidden" name="biblionumber" value="[% biblionumber %]" /> >+ <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();"><i class="fa fa-print"></i> Print slip and confirm</button> >+ <input type="hidden" name="return_date_override" value="[% return_date_override %]" /> >+ <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" /> >+ </form> >+ [% END %] >+ </div> > [% END %] > > [% IF ( found ) %] >@@ -350,7 +354,7 @@ $(document).ready(function () { > [% END %] > > [% IF ( diffbranch ) %] >- <!-- 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 %]">[% itembarcode |html %]: [% title |html %]</a></p> >@@ -389,46 +393,48 @@ $(document).ready(function () { > <input type="hidden" name="return_date_override" value="[% return_date_override %]" /> > <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" /> > </form> >- </div> >+ </div> > [% END %] > > [% IF ( transfer ) %] > <!-- transfer: item with no reservation, must be returned according to home library circulation rules --> > <div id="return1" class="dialog message audio-alert-action"> >- <h3>Please return item to: [% Branches.GetName( returnbranch ) %]</h3> >+ <h3>Transferring item to: [% Branches.GetName( returnbranch ) %]</h3> > <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> >- <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% returnbranch %]&op=slip"><i class="fa fa-print"></i> Print slip</button></p> >+ <button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% returnbranch %]&op=slip"><i class="fa fa-print"></i> Print slip</button> >+ <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button> > </div> > [% END %] > > [% IF ( needstransfer ) %] >- <!-- needstransfer --> >- <div id="item-transfer" class="dialog message audio-alert-action"><h3> This item needs to be transferred to [% Branches.GetName( returnbranch ) %]</h3> >- Transfer now?<br /> >- <form method="post" action="returns.pl" name="mainform" id="mainform"> >- [% IF itemnumber %] >- <button type="submit" name="dotransfer" value="Yes" class="print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% returnbranch %]&op=slip"><i class="fa fa-print"></i> Yes, print slip</button> >- [% END %] >- <button type="submit" name="dotransfer" value="Yes" class="submit"><i class="fa fa-check"></i> Yes</button> >- <button type="submit" name="notransfer" value="No" class="submit"><i class="fa fa-times"></i> No</button> >- <input type="hidden" name="tobranch" value="[% returnbranch %]" /> >- <input type="hidden" name="transferitem" value="[% itemnumber %]" /> >- <input type="hidden" name="exemptfine" value="[% exemptfine %]" /> >- <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" /> >- <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" /> >- [% FOREACH inputloo IN inputloop %] >- <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" /> >- <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" /> >- <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" /> >- [% END %] >- <input type="hidden" name="barcode" value="0" /> >- <input type="hidden" name="return_date_override" value="[% return_date_override %]" /> >- <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" /> >- </form> </div> >+ <!-- needstransfer --> >+ <div id="item-transfer" class="dialog message audio-alert-action"><h3> This item needs to be transferred to [% Branches.GetName( returnbranch ) %]</h3> >+ Transfer now?<br /> >+ <form method="post" action="returns.pl" name="mainform" id="mainform"> >+ [% IF itemnumber %] >+ <button type="submit" name="dotransfer" value="Yes" class="print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% returnbranch %]&op=slip"><i class="fa fa-print"></i> Yes, print slip</button> >+ [% END %] >+ <button type="submit" name="dotransfer" value="Yes" class="submit"><i class="fa fa-check"></i> Yes</button> >+ <button type="submit" name="notransfer" value="No" class="submit"><i class="fa fa-times"></i> No</button> >+ <input type="hidden" name="tobranch" value="[% returnbranch %]" /> >+ <input type="hidden" name="transferitem" value="[% itemnumber %]" /> >+ <input type="hidden" name="exemptfine" value="[% exemptfine %]" /> >+ <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" /> >+ <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" /> >+ [% FOREACH inputloo IN inputloop %] >+ <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" /> >+ <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" /> >+ <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" /> >+ [% END %] >+ <input type="hidden" name="barcode" value="0" /> >+ <input type="hidden" name="return_date_override" value="[% return_date_override %]" /> >+ <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" /> >+ </form> >+ </div> > [% END %] > > [% IF ( diffbranch ) %] >- <!-- diffbranch --> >+ <!-- diffbranch --> > <h3 class="audio-alert-action">Item consigned:</h3> > <table> > <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title |html %]</a></caption> >@@ -456,7 +462,7 @@ $(document).ready(function () { > > <!-- case of simple return no issue or transfer but with a reservation --> > [% IF ( reserved ) %] >- <!-- reserved --> >+ <!-- reserved --> > <div id="hold-found2" class="modal fade audio-alert-action"> > <div class="modal-dialog"> > <div class="modal-content"> >@@ -655,32 +661,29 @@ $(document).ready(function () { > <div class="yui-g"> > <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" > > <div class="yui-u first"> >- <fieldset> >- <legend>Check in</legend> >- <label for="barcode">Enter item barcode: </label> >- [% IF ( exemptfine ) %] >- <input name="barcode" id="barcode" size="14" class="focus alert"/> >- [% ELSIF ( dropboxmode ) %] >- <input name="barcode" id="barcode" size="14" class="focus alert"/> >- [% ELSE %] >- <input name="barcode" id="barcode" size="14" class="focus"/> >- [% END %] >- <input type="submit" class="submit" value="Submit" /> >- >- [% IF Koha.Preference('SpecifyReturnDate') %] >- <div class="date-select" id="return_date_override_fields"> >- <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div> >- >- <input type="text" size="13" id="return_date_override" name="return_date_override" value="[% return_date_override %]" /> >- >- <label for="return_date_override_remember"> Remember for next check in:</label> >- [% IF ( return_date_override_remember ) %] >- <input type="checkbox" id="return_date_override_remember" onclick="this.form.barcode.focus();" name="return_date_override_remember" checked="checked" /> >- [% ELSE %] >- <input type="checkbox" id="return_date_override_remember" onclick="this.form.barcode.focus();" name="return_date_override_remember" /> >- [% END %] >- >- <input type="button" class="action" id="cleardate" value="Clear" name="cleardate" onclick="this.checked = false; this.form.return_date_override.value = ''; this.form.return_date_override_remember.checked = false; this.form.barcode.focus(); return false;" /> >+ <fieldset> >+ <legend>Check in</legend> >+ <label for="barcode">Enter item barcode: </label> >+ [% IF ( exemptfine ) %] >+ <input name="barcode" id="barcode" size="14" class="focus alert"/> >+ [% ELSIF ( dropboxmode ) %] >+ <input name="barcode" id="barcode" size="14" class="focus alert"/> >+ [% ELSE %] >+ <input name="barcode" id="barcode" size="14" class="focus"/> >+ [% END %] >+ <input type="submit" class="submit" value="Submit" /> >+ >+ [% IF Koha.Preference('SpecifyReturnDate') %] >+ <div class="date-select" id="return_date_override_fields"> >+ <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div> >+ <input type="text" size="13" id="return_date_override" name="return_date_override" value="[% return_date_override %]" /> >+ <label for="return_date_override_remember"> Remember for next check in:</label> >+ [% IF ( return_date_override_remember ) %] >+ <input type="checkbox" id="return_date_override_remember" onclick="this.form.barcode.focus();" name="return_date_override_remember" checked="checked" /> >+ [% ELSE %] >+ <input type="checkbox" id="return_date_override_remember" onclick="this.form.barcode.focus();" name="return_date_override_remember" /> >+ [% END %] >+ <input type="button" class="action" id="cleardate" value="Clear" name="cleardate" onclick="this.checked = false; this.form.return_date_override.value = ''; this.form.return_date_override_remember.checked = false; this.form.barcode.focus(); return false;" /> > </div> > [% END %] > [% FOREACH inputloo IN inputloop %] >-- >2.1.4
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 18490
: 62649 |
64561
|
66967