Bugzilla – Attachment 191347 Details for
Bug 41565
Tidy kohaTable block - bookings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 41565: Tidy kohaTable - bookings/list.tt
Bug-41565-Tidy-kohaTable---bookingslisttt.patch (text/plain), 4.87 KB, created by
Owen Leonard
on 2026-01-13 13:04:04 UTC
(
hide
)
Description:
Bug 41565: Tidy kohaTable - bookings/list.tt
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2026-01-13 13:04:04 UTC
Size:
4.87 KB
patch
obsolete
>From 32b534d5c5513d666fa588e8046cce7243fe29e5 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 8 Jan 2026 11:18:46 +0100 >Subject: [PATCH] Bug 41565: Tidy kohaTable - bookings/list.tt > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../prog/en/modules/bookings/list.tt | 23 +++++++++++-------- > 1 file changed, 13 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt >index 0f0103f2ed3..ce36863d1c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt >@@ -72,6 +72,11 @@ > var bookings_table; > var timeline; > let biblionumber = "[% biblionumber | uri %]"; >+ addPermissions({ >+ CAN_user_circulate_manage_bookings: [% CAN_user_circulate_manage_bookings ? 1 : 0 | html %], >+ }); >+ </script> >+ <script> > $(document).ready(function(){ > > var items = $.ajax({ >@@ -115,11 +120,10 @@ > end: dayjs(booking.end_date).toDate(), > content: !isActive ? `<s>${patronContent}</s>` : patronContent, > className: booking.status === "cancelled" ? "cancelled" : "", >- [% IF CAN_user_circulate_manage_bookings %] >- editable: !["cancelled", "completed"].includes(booking.status) ? { remove: true, updateTime: true } : false, >- [% ELSE %] >- editable: false, >- [% END %] >+ ...(permissions.CAN_user_circulate_manage_bookings >+ ? {editable: !["cancelled", "completed"].includes(booking.status) ? { remove: true, updateTime: true } : false} >+ : {editable: false} >+ ), > type: 'range', > group: booking.item_id ?? 0, > }); >@@ -170,7 +174,7 @@ > // set end datetime hours and minutes to the end of the day > let endDate = dayjs(data.end).endOf('day'); > >- $('#placeBookingModal').modal('show', $('<button data-booking="'+data.id+'" data-biblionumber="[% biblionumber | uri %]" data-itemnumber="'+data.group+'" data-patron="'+data.patron+'" data-pickup_library="'+data.pickup_library+'" data-start_date="'+startDate.toISOString()+'" data-end_date="'+endDate.toISOString()+'">')); >+ $('#placeBookingModal').modal('show', $('<button data-booking="'+data.id+'" data-biblionumber="' + biblionumber + '" data-itemnumber="'+data.group+'" data-patron="'+data.patron+'" data-pickup_library="'+data.pickup_library+'" data-start_date="'+startDate.toISOString()+'" data-end_date="'+endDate.toISOString()+'">')); > $('#placeBookingModal').on('hide.bs.modal', function(e) { > if (update_success) { > update_success = 0; >@@ -363,8 +367,7 @@ > render: function(data, type, row, meta) { > let result = ""; > const is_readonly = ["cancelled", "completed"].includes(row.status); >- [% IF CAN_user_circulate_manage_bookings %] >- if (!is_readonly) { >+ if (permissions.CAN_user_circulate_manage_bookings && !is_readonly) { > result += ` > <button type="button" class="btn btn-default btn-xs edit-action" > data-bs-toggle="modal" >@@ -403,9 +406,10 @@ > escape_str(row.booking_id), > _("Cancel") > ); >+ const csrf_token = $('meta[name="csrf-token"]').attr("content"); > result += ` > <form name="checkout-transform" method="post" action="/cgi-bin/koha/circ/circulation.pl?borrowernumber=%s"> >- [% INCLUDE 'csrf-token.inc' %] >+ <input type="hidden" name="csrf_token" value="${csrf_token}" /> > <input type="hidden" name="op" value="cud-checkout"/> > <input type="hidden" name="borrowernumber" value="%s"/> > <input type="hidden" name="barcode" value="%s"/> >@@ -422,7 +426,6 @@ > _("Transform to checkout") > ); > } >- [% END %] > return result; > } > }] >-- >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 41565
:
191101
|
191102
| 191347 |
191348