Bugzilla – Attachment 185715 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: [squash me] Tidy
Bug-37661-squash-me-Tidy.patch (text/plain), 8.68 KB, created by
Baptiste Wojtkowski (bwoj)
on 2025-08-22 12:16:46 UTC
(
hide
)
Description:
Bug 37661: [squash me] Tidy
Filename:
MIME Type:
Creator:
Baptiste Wojtkowski (bwoj)
Created:
2025-08-22 12:16:46 UTC
Size:
8.68 KB
patch
obsolete
>From 7dadd0fd225255ff7935c0a9893646ce859bbd67 Mon Sep 17 00:00:00 2001 >From: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com> >Date: Tue, 12 Aug 2025 13:16:12 +0000 >Subject: [PATCH] Bug 37661: [squash me] Tidy > >--- > .../atomicupdate/bug_37661-EnableBooking_syspref.pl | 4 +++- > installer/data/mysql/mandatory/sysprefs.sql | 2 +- > .../prog/en/modules/catalogue/ISBDdetail.tt | 8 ++++++-- > .../prog/en/modules/catalogue/MARCdetail.tt | 8 ++++++-- > .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 1 - > .../prog/en/modules/catalogue/imageviewer.tt | 8 ++++++-- > .../prog/en/modules/catalogue/labeledMARCdetail.tt | 10 +++++++--- > .../prog/en/modules/catalogue/moredetail.tt | 1 - > .../prog/en/modules/circ/circulation-home.tt | 2 +- > 9 files changed, 30 insertions(+), 14 deletions(-) > mode change 100644 => 100755 installer/data/mysql/atomicupdate/bug_37661-EnableBooking_syspref.pl > >diff --git a/installer/data/mysql/atomicupdate/bug_37661-EnableBooking_syspref.pl b/installer/data/mysql/atomicupdate/bug_37661-EnableBooking_syspref.pl >old mode 100644 >new mode 100755 >index 4a5c2182de..1fd8bb1796 >--- a/installer/data/mysql/atomicupdate/bug_37661-EnableBooking_syspref.pl >+++ b/installer/data/mysql/atomicupdate/bug_37661-EnableBooking_syspref.pl >@@ -8,7 +8,9 @@ return { > my ($args) = @_; > my ( $dbh, $out ) = @$args{qw(dbh out)}; > >- $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('EnableBooking','1',NULL,'If enabled, activate every functionnalities related with Bookings module','YesNo')}); >+ $dbh->do( >+ q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('EnableBooking','1',NULL,'If enabled, activate every functionalities related with Bookings module','YesNo')} >+ ); > > say_success( $out, "Added new system preference 'EnableBooking'" ); > }, >diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql >index 8561b1e985..6d1ce60218 100644 >--- a/installer/data/mysql/mandatory/sysprefs.sql >+++ b/installer/data/mysql/mandatory/sysprefs.sql >@@ -251,8 +251,8 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('EmailPurchaseSuggestions','0','0|EmailAddressForSuggestions|BranchEmailAddress|KohaAdminEmailAddress','Choose email address that new purchase suggestions will be sent to: ','Choice'), > ('EmailSMSSendDriverFromAddress', '', '', 'Email SMS send driver from address override', 'Free'), > ('EnableAdvancedCatalogingEditor','0','','Enable the Rancor advanced cataloging editor','YesNo'), >-('EnableBorrowerFiles','0',NULL,'If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo'), > ('EnableBooking','1',NULL,'If enabled, activate every functionnalities related with Bookings module','YesNo'), >+('EnableBorrowerFiles','0',NULL,'If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo'), > ('EnableExpiredPasswordReset', '0', NULL, 'Enable ability for patrons with expired password to reset their password directly', 'YesNo'), > ('EnableItemGroupHolds','0','','Enable item groups holds feature','YesNo'), > ('EnableItemGroups','0','','Enable the item groups feature','YesNo'), >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 87b52a94bc..8c4c475b4e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >@@ -82,8 +82,12 @@ > <script> > dayjs.extend(window.dayjs_plugin_isSameOrBefore); > </script> >- <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script> >- <script>dayjs.extend(window.dayjs_plugin_isSameOrBefore)</script> >+ <script> >+ dayjs.extend(window.dayjs_plugin_isSameOrAfter); >+ </script> >+ <script> >+ dayjs.extend(window.dayjs_plugin_isSameOrBefore); >+ </script> > [% Asset.js("js/catalog.js") | $raw %] > > [% IF Koha.Preference('EnableBooking') %] >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 5e182c0821..5524600394 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -206,8 +206,12 @@ > <script> > dayjs.extend(window.dayjs_plugin_isSameOrBefore); > </script> >- <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script> >- <script>dayjs.extend(window.dayjs_plugin_isSameOrBefore)</script> >+ <script> >+ dayjs.extend(window.dayjs_plugin_isSameOrAfter); >+ </script> >+ <script> >+ dayjs.extend(window.dayjs_plugin_isSameOrBefore); >+ </script> > [% Asset.js("js/catalog.js") | $raw %] > > [% IF Koha.Preference('EnableBooking') %] >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 5c6a36cb1c..291b8ebd45 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1725,7 +1725,6 @@ > [% 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 102eb4e664..2244ac18f7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >@@ -136,8 +136,12 @@ > <script> > dayjs.extend(window.dayjs_plugin_isSameOrBefore); > </script> >- <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script> >- <script>dayjs.extend(window.dayjs_plugin_isSameOrBefore)</script> >+ <script> >+ dayjs.extend(window.dayjs_plugin_isSameOrAfter); >+ </script> >+ <script> >+ dayjs.extend(window.dayjs_plugin_isSameOrBefore); >+ </script> > [% Asset.js("js/catalog.js") | $raw %] > > [% IF Koha.Preference('EnableBooking') %] >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 3e7c371433..7107f5e3bd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >@@ -95,15 +95,19 @@ > <script> > dayjs.extend(window.dayjs_plugin_isSameOrBefore); > </script> >- <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script> >- <script>dayjs.extend(window.dayjs_plugin_isSameOrBefore)</script> >+ <script> >+ dayjs.extend(window.dayjs_plugin_isSameOrAfter); >+ </script> >+ <script> >+ dayjs.extend(window.dayjs_plugin_isSameOrBefore); >+ </script> > [% Asset.js("js/catalog.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 %] >+ [% Asset.js("js/modals/place_booking.js") | $raw %] > [% END %] > > [% IF ( Koha.Preference('CatalogConcerns') ) %] >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 f82205b782..6619b86b4e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -596,7 +596,6 @@ > [% 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/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >index b8ca799844..b35f081876 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >@@ -76,7 +76,7 @@ > > <div class="col-12 col-sm-4"> > <div class="holds-bookings"> >- <h3>Holds [% IF Koha.Preference('EnableBooking') %] and bookings [% END %]</h3> >+ <h3>Holds [% IF Koha.Preference('EnableBooking') %]and bookings[% END %]</h3> > > <ul class="buttons-list"> > <li> >-- >2.43.0
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