Attachment 91359 Details for Bug 23192 – Bug 23192: Correct tab input on waiting_holds.inc

[patch] Bug 23192: Correct tab input on waiting_holds.inc

Bug-23192-Correct-tab-input-on-waitingholdsinc.patch (text/plain), 3.26 KB, created by Maryse Simard on 2019-07-05 18:34:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maryse Simard

Created: 2019-07-05 18:34:24 UTC

Size: 3.26 KB

patch

obsolete

>From 97bd894274f3c630078d03b21d70242c2a14f4b3 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Mon, 24 Jun 2019 11:54:56 +0000
>Subject: [PATCH] Bug 23192: Correct tab input on waiting_holds.inc
>
>To test:
> 1 - Place 2 holds
> 2 - Confirm the holds
> 3 - In the db change the expiration date:
>UPDATE reserves SET expirationdate = '2019-01-01';
> 4 - Go to Home->Circulation->Holds awaiting pickup
> 5 - View your holds on the 'Holds waiting over' tab
> 6 - Inspect the cancel button for one of the holds, note tab = "holdswaiting"
> 7 - Apply patch
> 8 - Refresh the page
> 9 - Inspect the buttton, note tab = "holdsover"
>10 - Cancel the hold
>11 - Note you return to the holds over tab
>
>Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc      | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>index 2bdf8c7..8ffa7df 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
>@@ -49,7 +49,7 @@
>                         <input type="hidden" name="itemnumber" value="[% reserveloo.item.itemnumber | html %]" />
>                         <input type="hidden" name="fbr" value="[% reserveloo.item.holdingbranch | html %]" />
>                         <input type="hidden" name="tbr" value="[% reserveloo.item.homebranch | html %]" />
>-                        <input type="hidden" name="tab" value="holdswaiting">
>+                        <input type="hidden" name="tab" value="[% tab %]">
>                         [% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %]
>                             <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold and return to: [% Branches.GetName( reserveloo.item.homebranch ) | html %]</button>
>                         [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>index 6bc4331..528cee5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>@@ -73,7 +73,7 @@
>             </ul>
>             <div id="holdswaiting">
>         [% IF ( reserveloop ) %]
>-            [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop %]
>+            [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %]
>         [% ELSE %]
>             <div class="dialog message">No holds found.</div>
>         [% END %]
>@@ -96,7 +96,7 @@
>                         Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref)
>                    [% END %]
>                 </span>
>-               [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop %]
>+               [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %]
>             [% ELSE %]
>                 <div class="dialog message">No holds found.</div>
>             [% END %]
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 23192: 90942 | 91359 | 91392