Bugzilla – Attachment 194681 Details for
Bug 41582
Tidy kohaTable block - opac
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 41582: (follow-up) Fix some syntax errors and variable collisions
8d9c05e.patch (text/plain), 3.70 KB, created by
Jonathan Druart
on 2026-03-06 11:53:28 UTC
(
hide
)
Description:
Bug 41582: (follow-up) Fix some syntax errors and variable collisions
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2026-03-06 11:53:28 UTC
Size:
3.70 KB
patch
obsolete
>From 8d9c05ef6b9c6331c24eafff1938dbde6b1af7f1 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 14 Jan 2026 14:30:19 -0500 >Subject: [PATCH] Bug 41582: (follow-up) Fix some syntax errors and variable > collisions > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../bootstrap/en/includes/opac-bottom.inc | 8 +++----- > .../bootstrap/en/modules/opac-detail.tt | 18 ++++++++---------- > 2 files changed, 11 insertions(+), 15 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >index 825846e29af..1f3abf2e1fc 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -107,11 +107,9 @@ > [% Asset.js("js/amazonimages.js") | $raw %] > [% END %] > <script> >- [% IF (query_desc) %] >- var query_desc = "[% query_desc | html %]"; >- var querystring = "[% querystring | html %]"; >- var query_cgi = "[% query_cgi | html %]"; >- [% END %] >+ var query_desc = "[% query_desc | html %]"; >+ var querystring = "[% querystring | html %]"; >+ var query_cgi = "[% query_cgi | html %]"; > > [% IF ( OPACAmazonCoverImages || SyndeticsCoverImages ) %] > $(window).load(function() { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >index 24c88fd40eb..ba3598bff0c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -1639,13 +1639,6 @@ > > [% Asset.js("lib/Chocolat/js/chocolat.js") | $raw %] > >- [% IF ( Koha.Preference('OPACShowMusicalInscripts') ) %] >- <script> >- var interface = "[% interface | html %]"; >- var PREF_OPACPlayMusicalInscripts = "[% Koha.Preference('OPACPlayMusicalInscripts') | html %]"; >- </script> >- [% Asset.js("js/verovio.js") | $raw %] >- [% END %] > [% Asset.js("lib/emoji-picker/js/emoji-picker-all.min.js") | $raw %] > [% IF OpenLibraryCovers || OpenLibrarySearch %] > [% Asset.js("js/openlibrary.js") | $raw %] >@@ -1670,7 +1663,6 @@ > OPACTableColExpandedByDefault: [% Koha.Preference('OPACTableColExpandedByDefault') ? 1 : 0 | html %], > }); > const busc = "[% busc | html %]"; >- const query_desc = "[% query_desc | html %]"; > const loggedinusername = "[% loggedinusername | html %]"; > > var holdingst_table_settings = [% TablesSettings.GetTableSettings( 'opac', 'biblio-detail', 'holdingst', 'json' ) | $raw %]; >@@ -1700,6 +1692,12 @@ > > const defaulttab = "[% defaulttab | html %]"; > </script> >+ [% IF ( Koha.Preference('OPACShowMusicalInscripts') ) %] >+ <script> >+ var PREF_OPACPlayMusicalInscripts = "[% Koha.Preference('OPACPlayMusicalInscripts') | html %]"; >+ </script> >+ [% Asset.js("js/verovio.js") | $raw %] >+ [% END %] > <script> > window.emojiPicker = new EmojiPicker({ > emojiable_selector: '[data-emojiable=true]', >@@ -1944,7 +1942,7 @@ > case 'media' > showBsTab("bibliodescriptions", "html5media"); > break >- case: >+ default: > showBsTab("bibliodescriptions", "holdings"); > } > >@@ -2052,7 +2050,7 @@ > }); > } > >- if (query_desc){ >+ if (query_desc !==""){ > if (prefs.OpacHighlightedWords){ > var query_desc_replaced = query_desc.replace("'", "\'").replace('\n', '\\n').replace('\r', '\\r'); > q_array = query_desc_replaced.split(" "); >-- >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 41582
:
191174
|
191175
|
191176
|
191177
|
191178
|
191179
|
191180
|
191181
|
191182
|
191183
|
191184
|
191185
|
191186
|
191187
|
191188
|
191450
|
191451
|
191452
|
191453
|
191454
|
191455
|
191456
|
191457
|
191458
|
191459
|
191460
|
191461
|
191462
|
191463
|
191464
|
191465
|
191569
|
194666
|
194667
|
194668
|
194669
|
194670
|
194671
|
194672
|
194673
|
194674
|
194675
|
194676
|
194677
|
194678
|
194679
|
194680
| 194681 |
194682