Bugzilla – Attachment 182961 Details for
Bug 39939
Cancel selected holds button on the holds awaiting pickup page is the same color as the background
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39939: Cancel selected holds button on waitingreserves.pl is the same color as the background
Bug-39939-Cancel-selected-holds-button-on-waitingr.patch (text/plain), 6.67 KB, created by
David Nind
on 2025-06-04 23:54:33 UTC
(
hide
)
Description:
Bug 39939: Cancel selected holds button on waitingreserves.pl is the same color as the background
Filename:
MIME Type:
Creator:
David Nind
Created:
2025-06-04 23:54:33 UTC
Size:
6.67 KB
patch
obsolete
>From 1aa19f65d015ff664b267474da6507560e0ea398 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 27 May 2025 15:21:47 +0000 >Subject: [PATCH] Bug 39939: Cancel selected holds button on waitingreserves.pl > is the same color as the background > >This patch makes some minor changes to the "Holds awaiting pickup" page >so that the cancel buttons are clear and usable. > >The patch also wraps the reference to the >TransferWhenCancelAllWaitingHolds system preference in a permission >check so that it can be linked to the preference when appropriate. > >To test you should have some waiting holds in three categories: > >1. Holds which have not been waiting longer than the number of days > specified in the ReservesMaxPickUpDelay system preference. > >2. Holds which have been waiting longer. I belive the only way to test > this is to manually update the expiration date of an already waiting > hold so that it is in the past. > >3. Waiting holds which a patron has requested be cancelled. (Requires > that the patron and hold are allowed according to the "Cancellation > allowed" setting under Administration -> Circulation and fine rules > -> Default waiting hold cancellation policy. > - Log in to the OPAC as a patron who has a waiting hold. On the "Your > summary" page, under the "Holds" tab, click the "Request to cancel" > button for at least one of the waiting holds. > >- In the staff interface, go to Circulation -> Holds awaiting pickup. > - Under each tab, check the appearance of the "Cancel selected" > buttons (and the "Cancel and transfer all" button under "Holds > awaiting past..." tab). >- When testing as a user with system preference privileges, and the > TransferWhenCancelAllWaitingHolds preference set to "Don't transfer," > the hint shown under the "Holds awaiting past..." tab should be linked > to system preferences. A user without system preference privileges > should not see a link. > >Sponsored-by: Athens County Public Libraries >Signed-off-by: David Nind <david@davidnind.com> >--- > .../prog/en/modules/circ/waitingreserves.tt | 34 ++++++++++++++----- > 1 file changed, 25 insertions(+), 9 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 1de9bd9eac..5b44502d5c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -15,6 +15,15 @@ > [% END %]</title > > > [% INCLUDE 'doc-head-close.inc' %] >+[% FILTER collapse %] >+ <style> >+ .tab-toolbar { >+ padding: 0.5rem 0; >+ margin-bottom: 0.5rem; >+ border-bottom: 1px solid #eee; >+ } >+ </style> >+[% END %] > </head> > > <body id="circ_waitingreserves" class="circ"> >@@ -97,8 +106,8 @@ > [% WRAPPER tab_panels %] > [% WRAPPER tab_panel tabname="holdswaiting" bt_active= 1 %] > [% IF ( reserveloop ) %] >- <div id="toolbar" class="btn-toolbar"> >- <button class="btn cancel_selected_holds" data-bulk="true"></button> >+ <div class="tab-toolbar"> >+ <button class="btn btn-default cancel_selected_holds" data-bulk="true"></button> > </div> > [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %] > [% ELSE %] >@@ -108,8 +117,8 @@ > > [% WRAPPER tab_panel tabname="holdsover" %] > [% IF ( overloop ) %] >- <div id="toolbar" class="btn-toolbar"> >- <button class="btn cancel_selected_holds" data-bulk="true"></button> >+ <div class="tab-toolbar"> >+ <button class="btn btn-default cancel_selected_holds" data-bulk="true"></button> > <div class="btn-group"> > <form name="cancelAllReserve" action="waitingreserves.pl" method="post"> > [% INCLUDE 'csrf-token.inc' %] >@@ -117,15 +126,22 @@ > <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" /> >+ <button type="submit" class="btn btn-primary">Cancel and transfer all</button> > [% ELSE %] >- <input type="submit" class="btn btn-primary" value="Cancel all" /> >+ <button type="submit" class="btn btn-primary">Cancel all</button> > [% END %] > </form> > </div> > </div> > [% UNLESS TransferWhenCancelAllWaitingHolds %] >- <div class="hint">Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref)</div> >+ <div class="hint" >+ >Only items that need not be transferred will be cancelled >+ [% IF ( CAN_user_parameters_manage_sysprefs ) %] >+ (<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=TransferWhenCancelAllWaitingHolds">TransferWhenCancelAllWaitingHolds syspref</a>) >+ [% ELSE %] >+ (TransferWhenCancelAllWaitingHolds syspref) >+ [% END %] >+ </div> > [% END %] > [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %] > [% ELSE %] >@@ -135,8 +151,8 @@ > > [% 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 class="tab-toolbar"> >+ <button class="btn btn-default cancel_selected_holds" data-bulk="true"></button> > </div> > [% INCLUDE waiting_holds.inc select_column='1' table_name='holdscr' reserveloop=cancel_reqs tab='holdscr' %] > [% ELSE %] >-- >2.39.5
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 39939
:
182929
|
182956
|
182961
|
182962
|
183495
|
183496