gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Signed-off-by: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 0a18a15f2c)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
This commit is contained in:
Owen Leonard 2025-05-27 15:21:47 +00:00 committed by Paul Derscheid
parent 72f202dfad
commit 018cb3d351
No known key found for this signature in database
GPG Key ID: C25F9FD44CED595B
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
View File

@ -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 %]