Bugzilla – Attachment 184581 Details for
Bug 37661
Disable/Enable Bookings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 37661: Have 37737 depend on EnableBooking
Bug-37661-Have-37737-depend-on-EnableBooking.patch (text/plain), 4.85 KB, created by
Baptiste Wojtkowski (bwoj)
on 2025-07-24 09:13:36 UTC
(
hide
)
Description:
Bug 37661: Have 37737 depend on EnableBooking
Filename:
MIME Type:
Creator:
Baptiste Wojtkowski (bwoj)
Created:
2025-07-24 09:13:36 UTC
Size:
4.85 KB
patch
obsolete
>From 4324c6889dd47794222084cd2134eb7a44ab3059 Mon Sep 17 00:00:00 2001 >From: Baptiste <baptiste.wojtkowski@biblibre.com> >Date: Wed, 23 Jul 2025 16:52:57 +0200 >Subject: [PATCH] Bug 37661: Have 37737 depend on EnableBooking > >--- > .../prog/en/includes/patron-detail-tabs.inc | 38 ++++++++++--------- > .../prog/en/modules/members/moremember.tt | 10 +++-- > 2 files changed, 28 insertions(+), 20 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc >index 24e01ea9b3..8b12124883 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc >@@ -23,10 +23,12 @@ > [% WRAPPER tab_item tabname= "holds" %] > <span>Holds</span> ([% holds_count || 0 | html %]) > [% END %] >- [% WRAPPER tab_item tabname="bookings" %] >- [% SET bookings_count = patron.bookings.filter_by_active.count %] >- [% SET expired_bookings_count = patron.bookings.count - bookings_count %] >- <span class="bookings_count">Bookings ([% bookings_count || 0 | html %])</span> >+ [% IF Koha.Preference('EnableBooking') %] >+ [% WRAPPER tab_item tabname="bookings" %] >+ [% SET bookings_count = patron.bookings.filter_by_active.count %] >+ [% SET expired_bookings_count = patron.bookings.count - bookings_count %] >+ <span class="bookings_count">Bookings ([% bookings_count || 0 | html %])</span> >+ [% END %] > [% END %] > [% END %] > >@@ -214,19 +216,21 @@ > [% END %] > [% END # /tab_panel#holds %] > >- [% WRAPPER tab_panel tabname="bookings" %] >- [% IF ( bookings_count ) %] >- <fieldset class="action filters" style="cursor:pointer;"> >- <a id="expired_filter" class="filtered"><i class="fa fa-bars"></i> Show expired</a> >- </fieldset> >- <table id="bookings_table" style="width: 100% !Important;"></table> >- [% ELSIF ( expired_bookings_count ) %] >- <fieldset class="action filters" style="cursor:pointer;"> >- <a id="expired_filter"><i class="fa fa-filter"></i> Hide expired</a> >- </fieldset> >- <table id="bookings_table" style="width: 100% !Important;"></table> >- [% ELSE %] >- <p>Patron has nothing booked.</p> >+ [% IF Koha.Preference('EnableBooking') %] >+ [% WRAPPER tab_panel tabname="bookings" %] >+ [% IF ( bookings_count ) %] >+ <fieldset class="action filters" style="cursor:pointer;"> >+ <a id="expired_filter" class="filtered"><i class="fa fa-bars"></i> Show expired</a> >+ </fieldset> >+ <table id="bookings_table" style="width: 100% !Important;"></table> >+ [% ELSIF ( expired_bookings_count ) %] >+ <fieldset class="action filters" style="cursor:pointer;"> >+ <a id="expired_filter"><i class="fa fa-filter"></i> Hide expired</a> >+ </fieldset> >+ <table id="bookings_table" style="width: 100% !Important;"></table> >+ [% ELSE %] >+ <p>Patron has nothing booked.</p> >+ [% END %] > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 83f4b8893b..05a25c7199 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -752,7 +752,9 @@ > [% INCLUDE 'modals/resolve_return_claim.inc' %] > [% END %] > >-[% INCLUDE modals/cancel_booking.inc %] >+[% IF Koha.Preference('EnableBooking') %] >+ [% INCLUDE modals/cancel_booking.inc %] >+[% END %] > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >@@ -786,7 +788,10 @@ > [% END %] > [% Asset.js("js/holds.js") | $raw %] > [% INCLUDE 'calendar.inc' %] >- [% Asset.js("js/cancel_booking_modal.js") | $raw %] >+ [% IF Koha.Preference('EnableBooking') %] >+ [% Asset.js("js/cancel_booking_modal.js") | $raw %] >+ [% Asset.js("js/tables/bookings.js") | $raw %] >+ [% END %] > [% Asset.js("js/combobox.js") | $raw %] > [% INCLUDE 'js-biblio-format.inc' %] > [% INCLUDE 'str/members-menu.inc' %] >@@ -855,7 +860,6 @@ > }); > </script> > [% Asset.js("js/checkouts.js") | $raw %] >- [% Asset.js("js/tables/bookings.js") | $raw %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >-- >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 37661
:
184558
|
184559
|
184560
|
184561
|
184565
|
184566
|
184578
|
184579
|
184580
|
184581
|
184582
|
185150
|
185151
|
185152
|
185153
|
185154
|
185325
|
185326
|
185327
|
185329
|
185331
|
185333
|
185710
|
185711
|
185712
|
185713
|
185714
|
185715
|
185716