Bugzilla – Attachment 179300 Details for
Bug 25318
Convert authorities_js.inc to JavaScript file with translatable strings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25318: (follow-up) Make searchType be defined in merge.tt
Bug-25318-follow-up-Make-searchType-be-defined-in-.patch (text/plain), 1.41 KB, created by
Phil Ringnalda
on 2025-03-14 03:54:47 UTC
(
hide
)
Description:
Bug 25318: (follow-up) Make searchType be defined in merge.tt
Filename:
MIME Type:
Creator:
Phil Ringnalda
Created:
2025-03-14 03:54:47 UTC
Size:
1.41 KB
patch
obsolete
>From 1a69afba344db7704e2c0f9f8140db1456ad94f5 Mon Sep 17 00:00:00 2001 >From: Phil Ringnalda <phil@chetcolibrary.org> >Date: Thu, 13 Mar 2025 20:41:26 -0700 >Subject: [PATCH] Bug 25318: (follow-up) Make searchType be defined in merge.tt > >With authorities_js.inc doing "var searchType = '[% marclist | html %]';" in >merge.tt where marclist isn't defined we got "var searchType = '';". This >patch just adds 'const searchType = ""' directly to merge.tt to avoid a >JavaScript console error. > >Test plan: >1. Open the devtools console >2. Do an authority search that returns at least two authorities >3. Select one, then another for merge >4. When the merge.pl page loads, observe an "Uncaught ReferenceError" in > the console >5. Apply followup, repeat steps 1-3, without an "Uncaught ReferenceError" >--- > koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt | 3 +++ > 1 file changed, 3 insertions(+) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >index 179da2dd3d..1ddf1ca63d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >@@ -140,6 +140,9 @@ > [% END %] > > [% MACRO jsinclude BLOCK %] >+ <script> >+ const searchType = ""; >+ </script> > [% Asset.js("js/authorities.js") | $raw %] > [% Asset.js("js/merge-record.js") | $raw %] > <script> >-- >2.48.1
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 25318
:
178537
|
179299
| 179300