Attachment 78724 Details for Bug 21346 – [PATCH] Bug 21346: Remove old hold/transfer dialog

[patch] [PATCH] Bug 21346: Remove old hold/transfer dialog

PATCH-Bug-21346-Remove-old-holdtransfer-dialog.patch (text/plain), 5.60 KB, created by Christopher Brannon on 2018-09-14 19:47:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Brannon

Created: 2018-09-14 19:47:45 UTC

Size: 5.60 KB

patch

obsolete

>From be89a2a9be7d7123b4e22bfff89d031e94eda805 Mon Sep 17 00:00:00 2001
>From: Christopher Brannon <cbrannon@cdalibrary.org>
>Date: Fri, 14 Sep 2018 19:04:44 +0000
>Subject: [PATCH] [PATCH] Bug 21346: Remove old hold/transfer dialog
>
>TO TEST:
>1) Place a hold on an item from Branch A to be delivered to Branch B.
>2) Checkin the item at Branch A and confirm the hold to transfer.
>3) Be human and make a mistake.  Login as Branch C and check the item
>in.
>4) Note the great modal to redirect the hold.  Note that the old dialog
>is behind it!
>5) Apply the patch.
>6) Repeat step 3.  Now note that the old dialog is no longer on the
>page.
>---
> .../intranet-tmpl/prog/en/modules/circ/returns.tt  | 52 +++++-----------------
> 1 file changed, 10 insertions(+), 42 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 74b24f6..6ceb943 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -170,38 +170,6 @@
>     </div>
> [% END %]
> 
>-
>-[% IF ( WrongTransfer ) %]
>-    <div id="return2" class="dialog message">
>-        
>-        <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]</h3>
>-            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p>
>-        <button type="submit" class="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>
>-        <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber | html %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
>-[% IF ( patron.cardnumber ) %]<h5>Hold for:</h5>
>-        <ul>
>-            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">
>-            [% 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><a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a></li>[% END %]
>-        </ul>
>-
>-    <form method="post" action="returns.pl" class="confirm">
>-            <input type="hidden" name="WT-itemNumber" value="[% WrongTransferItem | html %]" />
>-            <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt | html %]" />
>-            <input type="hidden" name="WT-From" value="[% wtransfertFrom | html %]" />
>-            <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="[% biblionumber | html %]" />
>-            <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 | html %]" />
>-        <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
>-    </form>
>-    [% END %]</div>
>-[% END %]
>-
> [% IF ( found ) %]
>     [% IF ( waiting ) %]
>         <div id="hold-found1" class="modal fade audio-alert-action">
>@@ -609,21 +577,21 @@
>     <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"/>
>+            <div id="checkin_fields"><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" />
>+            <input type="submit" class="submit" value="Submit" /></div>
> 
>             [% IF Koha.Preference('SpecifyReturnDate') %]
>                 <div class="date-select" id="return_date_override_fields">
>-                    <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div>
>+                    <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: 
> 
>-                    <input type="text" size="13" id="return_date_override" name="return_date_override" value="[% return_date_override | html %]" />
>+                    <input type="text" size="13" id="return_date_override" name="return_date_override" value="[% return_date_override | html %]" /> </div>
> 
>                     <label for="return_date_override_remember"> Remember for next check in:</label>
>                     [% IF ( return_date_override_remember ) %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 21346: 78724 | 78726 | 78902 | 78915 | 78916 | 78942 | 78943 | 79685 | 79686 | 80879 | 81100 | 81836 | 81853 | 81921 | 81924 | 82049 | 82189 | 82190 | 82191 | 82192 | 82891 | 87625 | 87626 | 87627 | 87628 | 87894 | 87895 | 87896 | 87898