Bugzilla – Attachment 184559 Details for
Bug 37661
Disable/Enable Bookings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[24.11] Bug 37661: Have 29002 depend on EnableBooking
Bug-37661-Have-29002-depend-on-EnableBooking.patch (text/plain), 9.00 KB, created by
Baptiste Wojtkowski (bwoj)
on 2025-07-23 15:11:45 UTC
(
hide
)
Description:
[24.11] Bug 37661: Have 29002 depend on EnableBooking
Filename:
MIME Type:
Creator:
Baptiste Wojtkowski (bwoj)
Created:
2025-07-23 15:11:45 UTC
Size:
9.00 KB
patch
obsolete
>From 1418318739c62a4cb29c974e9d7978a65ab19c3f Mon Sep 17 00:00:00 2001 >From: Baptiste <baptiste.wojtkowski@biblibre.com> >Date: Wed, 23 Jul 2025 16:23:22 +0200 >Subject: [PATCH] Bug 37661: Have 29002 depend on EnableBooking > >--- > .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +- > .../prog/en/modules/catalogue/ISBDdetail.tt | 10 +++++++--- > .../prog/en/modules/catalogue/MARCdetail.tt | 10 +++++++--- > .../prog/en/modules/catalogue/detail.tt | 14 ++++++++++---- > .../prog/en/modules/catalogue/imageviewer.tt | 10 +++++++--- > .../prog/en/modules/catalogue/labeledMARCdetail.tt | 10 +++++++--- > .../prog/en/modules/catalogue/moredetail.tt | 12 +++++++++--- > 7 files changed, 48 insertions(+), 20 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >index 36d924b952..21ac014cec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >@@ -272,7 +272,7 @@ > [% END %] > [% END %] > >-[% IF ( CAN_user_circulate_manage_bookings && biblio.items.filter_by_bookable.count ) %] >+[% IF ( Koha.Preference('EnableBooking') && CAN_user_circulate_manage_bookings && biblio.items.filter_by_bookable.count ) %] > <div class="btn-group"><button id="placbooking" class="btn btn-default" data-bs-toggle="modal" data-bs-target="#placeBookingModal" data-biblionumber="[% biblionumber | html %]"><i class="fa fa-calendar"></i> Place booking</button></div> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >index 4beb984640..3e5819e7ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >@@ -91,10 +91,14 @@ > [% Asset.js("lib/dayjs/plugin/isSameOrBefore.js") | $raw %] > <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script> > <script>dayjs.extend(window.dayjs_plugin_isSameOrBefore)</script> >- [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'select2.inc' %] > [% Asset.js("js/catalog.js") | $raw %] >- [% Asset.js("js/modals/place_booking.js") | $raw %] >+ >+ [% IF Koha.Preference('EnableBooking') %] >+ [% INCLUDE 'calendar.inc' %] >+ [% INCLUDE 'select2.inc' %] >+ [% Asset.js("js/modals/place_booking.js") | $raw %] >+ [% END %] >+ > [% Asset.js("js/browser.js") | $raw %] > [% IF ( Koha.Preference('CatalogConcerns') ) %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >index 7ea162a6a0..4954aa4c66 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -217,10 +217,14 @@ > [% Asset.js("lib/dayjs/plugin/isSameOrBefore.js") | $raw %] > <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script> > <script>dayjs.extend(window.dayjs_plugin_isSameOrBefore)</script> >- [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'select2.inc' %] > [% Asset.js("js/catalog.js") | $raw %] >- [% Asset.js("js/modals/place_booking.js") | $raw %] >+ >+ [% IF Koha.Preference('EnableBooking') %] >+ [% INCLUDE 'calendar.inc' %] >+ [% INCLUDE 'select2.inc' %] >+ [% Asset.js("js/modals/place_booking.js") | $raw %] >+ [% END %] >+ > [% Asset.js("js/browser.js") | $raw %] > [% IF ( Koha.Preference('CatalogConcerns') ) %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index f1ee17b5ee..cfbf4c289f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1204,10 +1204,12 @@ > [% END %] > > [% MACRO jsinclude BLOCK %] >- [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'catalog-strings.inc' %] >- [% INCLUDE 'select2.inc' %] >- [% INCLUDE 'js-date-format.inc' %] >+ [% IF Koha.Preference('EnableBooking') %] >+ [% INCLUDE 'calendar.inc' %] >+ [% INCLUDE 'select2.inc' %] >+ [% INCLUDE 'js-date-format.inc' %] >+ [% END %] > [% Asset.js("js/catalog.js") | $raw %] > [% Asset.js("js/recalls.js") | $raw %] > [% Asset.js("js/coce.js") | $raw %] >@@ -1660,7 +1662,11 @@ > [% INCLUDE 'js-patron-format.inc' %] > [% INCLUDE 'js-biblio-format.inc' %] > [% Asset.js("js/browser.js") | $raw %] >- [% Asset.js("js/modals/place_booking.js") | $raw %] >+ >+ [% IF Koha.Preference('EnableBooking') %] >+ [% Asset.js("js/modals/place_booking.js") | $raw %] >+ [% END %] >+ > <script> > var browser; > browser = KOHA.browser("[% searchid | html %]", parseInt(biblionumber, 10)); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >index 9b7bd7e967..6936e33414 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >@@ -145,10 +145,14 @@ > [% Asset.js("lib/dayjs/plugin/isSameOrBefore.js") | $raw %] > <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script> > <script>dayjs.extend(window.dayjs_plugin_isSameOrBefore)</script> >- [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'select2.inc' %] > [% Asset.js("js/catalog.js") | $raw %] >- [% Asset.js("js/modals/place_booking.js") | $raw %] >+ >+ [% IF Koha.Preference('EnableBooking') %] >+ [% INCLUDE 'calendar.inc' %] >+ [% INCLUDE 'select2.inc' %] >+ [% Asset.js("js/modals/place_booking.js") | $raw %] >+ [% END %] >+ > [% IF ( Koha.Preference('CatalogConcerns') ) %] > <script> > /* Set a variable needed by add_catalog_concern.js */ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >index 9e560acc6f..fdfccc6c99 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >@@ -105,11 +105,15 @@ > [% Asset.js("lib/dayjs/plugin/isSameOrBefore.js") | $raw %] > <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script> > <script>dayjs.extend(window.dayjs_plugin_isSameOrBefore)</script> >- [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'select2.inc' %] > [% Asset.js("js/catalog.js") | $raw %] >- [% Asset.js("js/modals/place_booking.js") | $raw %] > [% Asset.js("js/browser.js") | $raw %] >+ >+ [% IF Koha.Preference('EnableBooking') %] >+ [% INCLUDE 'calendar.inc' %] >+ [% INCLUDE 'select2.inc' %] >+ [% Asset.js("js/modals/place_booking.js") | $raw %] >+ [% END %] >+ > [% IF ( Koha.Preference('CatalogConcerns') ) %] > <script> > /* Set a variable needed by add_catalog_concern.js */ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index 651cbf64ea..e1ac5b437c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -342,6 +342,7 @@ > <input type="submit" name="submit" class="btn btn-primary btn-xs" value="Update" /> > </form> > </li> >+ [% IF Koha.Preference('EnableBooking') %] > <li> > <span class="label"> > Bookable: >@@ -375,6 +376,7 @@ > [% END %] > <span class="hint"> Item type bookable: [% IF ITEM_DAT.effective_itemtype.bookable == 1 %]Yes[% ELSE %]No[% END %]</span> > </li> >+ [% END %] > > </ol> <!-- /.bibliodetails --> > </div> <!-- /.rows --> >@@ -525,12 +527,16 @@ > <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script> > <script>dayjs.extend(window.dayjs_plugin_isSameOrBefore)</script> > [% INCLUDE 'js-patron-format.inc' %] >- [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'select2.inc' %] > [% Asset.js("js/catalog.js") | $raw %] >- [% Asset.js("js/modals/place_booking.js") | $raw %] > [% Asset.js("js/browser.js") | $raw %] > [% Asset.js("js/checkout_renewals_modal.js") | $raw %] >+ >+ [% IF Koha.Preference('EnableBooking') %] >+ [% INCLUDE 'calendar.inc' %] >+ [% INCLUDE 'select2.inc' %] >+ [% Asset.js("js/modals/place_booking.js") | $raw %] >+ [% END %] >+ > [% IF ( Koha.Preference('CatalogConcerns') ) %] > <script> > /* Set a variable needed by add_catalog_concern.js */ >-- >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