Bugzilla – Attachment 161205 Details for
Bug 35360
Inconsistent use/look of 'Cancel hold(s)' button on circ/waitingreserves.pl
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35360: Make HTML/buttons consistent on waitingreserves.tt
Bug-35360-Make-HTMLbuttons-consistent-on-waitingre.patch (text/plain), 7.72 KB, created by
Marcel de Rooy
on 2024-01-19 10:58:23 UTC
(
hide
)
Description:
Bug 35360: Make HTML/buttons consistent on waitingreserves.tt
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2024-01-19 10:58:23 UTC
Size:
7.72 KB
patch
obsolete
>From 1aaad2ded06e792f1e4681fc839ad716736dd988 Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Tue, 12 Dec 2023 22:48:22 +0000 >Subject: [PATCH] Bug 35360: Make HTML/buttons consistent on waitingreserves.tt >Content-Type: text/plain; charset=utf-8 > >To test: >0. Turn on hold cancellation requests in Administration -> Circulation rules. >1. Have some holds that are waiting, waiting over expiration date, and cancelled waiting holds. In order to create holds waiting over expiration date, if you are in ktd, you can use SQL to update the expirationdate in reserves: UPDATE reserves SET expirationdate="2022-01-01" WHERE reserve_id=1; (make sure it's the correct reserve_id!) >1a. If you are not using ktd, you will need to set ReservesMaxPickUpDelay to 0 days, then return the reserved item and then wait one day before it will be marked as over expiration date. >1b. In order to create cancelled waiting holds, you will need to send a cancel request over the OPAC, that is, reserve something after logging in to the OPAC, return it in the staff interface, and then go to the OPAC -> Your Account -> Holds -> click Cancel on the waiting hold. >2. Notice the differences between the 3 tables and their related buttons: >-Holds waiting >-Holds waiting past their expiration date >-Holds with cancellation requests > >-Holds waiting includes a 'Canceled selected' button at the top of the table. It is with in a #toolbar. > >-Holds waiting past their expiration date includes a 'Cancel selected' and a 'Cancel all' button. None are within a #toolbar. The 'Cancel selected' here lacks a Bootstrap .btn class. The 'Cancel all' button does have a .btn class. > >-Holds with cancellation requests has neither a 'Cancel selected' or a 'Cancel all' button. > >3. APPLY PATCH >4. Look again and the tables/buttons should be more consistent. >5. The 'Holds with cancellation requests: X' tab should now include a 'Cancel selected (X)' button. Make sure is works. >6. Make sure TransferWhenCancelAllWaitingHolds is set to "Don't transfer" and make sure the hint displays well in the Holds over table. > >Signed-off-by: Philip Orr <philip.orr@lmscloud.de> > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > .../prog/en/modules/circ/waitingreserves.tt | 39 +++++++++++-------- > 1 file changed, 22 insertions(+), 17 deletions(-) > >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 97e72730bf..b86b8855c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -110,7 +110,7 @@ > [% WRAPPER tab_panel tabname="holdswaiting" bt_active= 1 %] > [% IF ( reserveloop ) %] > <div id="toolbar" class="btn-toolbar"> >- <button class="btn btn-default cancel_selected_holds" data-bulk="true"></button> >+ <button class="btn cancel_selected_holds" data-bulk="true"></button> > </div> > [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %] > [% ELSE %] >@@ -120,22 +120,24 @@ > > [% WRAPPER tab_panel tabname="holdsover" %] > [% IF ( overloop ) %] >- <span id="holdsover-cancel-all"> >- <button class="cancel_selected_holds" data-bulk="true"></button> >- <form name="cancelAllReserve" action="waitingreserves.pl" method="post"> >- <input type="hidden" name="cancelall" value="1" /> >- <input type="hidden" name="allbranches" value="[% allbranches | html %]" /> >- <input type="hidden" name="tab" value="holdsover"> >- [% IF TransferWhenCancelAllWaitingHolds %] >- <input type="submit" class="btn btn-primary" value="Cancel and transfer all" /> >- [% ELSE %] >- <input type="submit" class="btn btn-primary" value="Cancel all" /> >- [% END %] >- </form> >- [% UNLESS TransferWhenCancelAllWaitingHolds %] >- Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref) >- [% END %] >- </span> >+ <div id="toolbar" class="btn-toolbar"> >+ <button class="btn cancel_selected_holds" data-bulk="true"></button> >+ <div class="btn-group"> >+ <form name="cancelAllReserve" action="waitingreserves.pl" method="post"> >+ <input type="hidden" name="cancelall" value="1" /> >+ <input type="hidden" name="allbranches" value="[% allbranches | html %]" /> >+ <input type="hidden" name="tab" value="holdsover"> >+ [% IF TransferWhenCancelAllWaitingHolds %] >+ <input type="submit" class="btn btn-primary" value="Cancel and transfer all" /> >+ [% ELSE %] >+ <input type="submit" class="btn btn-primary" value="Cancel all" /> >+ [% END %] >+ </form> >+ </div> >+ </div> >+ [% UNLESS TransferWhenCancelAllWaitingHolds %] >+ <div class="hint">Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref)</div> >+ [% END %] > [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %] > [% ELSE %] > <div class="dialog message">No holds found.</div> >@@ -144,6 +146,9 @@ > > [% WRAPPER tab_panel tabname="holdscancelled" %] > [% IF cancel_reqs_count %] >+ <div id="toolbar" class="btn-toolbar"> >+ <button class="btn cancel_selected_holds" data-bulk="true"></button> >+ </div> > [% INCLUDE waiting_holds.inc select_column='1' table_name='holdscr' reserveloop=cancel_reqs tab='holdscr' %] > [% ELSE %] > <div class="dialog message">No holds found.</div> >-- >2.30.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 35360
:
159779
|
159833
|
159945
|
160010
| 161205