[Bug 42281] New: Tidy all script tags - authorities
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Bug ID: 42281 Summary: Tidy all script tags - authorities Initiative type: --- Sponsorship --- status: Product: Koha Version: unspecified Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 - low Component: Architecture, internals, and plumbing Assignee: koha-bugs@lists.koha-community.org Reporter: jonathan.druart@gmail.com QA Contact: testopia@bugs.koha-community.org Blocks: 42094 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42094 [Bug 42094] Tidy all script tags (except value_builder) -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|koha-bugs@lists.koha-commun |jonathan.druart@gmail.com |ity.org | -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #1 from Jonathan Druart <jonathan.druart@gmail.com> --- *** Bug 42285 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #2 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 196781 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=196781&action=edit Bug 42281: Tidy all script tags - authorities In order to tidy all the script tags of the .tt files we isolate the interpolation of Template::Toolkit variables in a separate script tag. This patch focuses on the authority module. The 3 main changes are in the following files: * detail.tt * merge.tt * searchresultlist-auth.tt diff is trivial Note that authorities/authorities.tt is on a separate bug (bug 42284) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #3 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 196782 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=196782&action=edit Bug 42281: Tidy all script tags - authorities (auto tidy) Patch from commit e2e0831 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #196781|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #4 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 196816 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=196816&action=edit Bug 42281: Tidy all script tags - authorities In order to tidy all the script tags of the .tt files we isolate the interpolation of Template::Toolkit variables in a separate script tag. This patch focuses on the authority module. The 3 main changes are in the following files: * detail.tt * merge.tt * searchresultlist-auth.tt diff is trivial Note that authorities/authorities.tt is on a separate bug (bug 42284) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #196782|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #5 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 196817 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=196817&action=edit Bug 42281: Tidy all script tags - authorities (auto tidy) Patch from commit 0895608 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #6 from Phil Ringnalda <phil@chetcolibrary.org> --- Comment on attachment 196817 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=196817 Bug 42281: Tidy all script tags - authorities (auto tidy)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt @@ -144,25 +144,31 @@ [% MACRO jsinclude BLOCK %] <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true"> var index = "[% index | html %]"; - var authtypecode = "[% authtypecode | html %]"; - const searchType = "[% marclist | html %]"; - const template_path = "[% interface | html %]/[% theme | html %]"; - const source = "[% source | html %]"; + var authtypecode = "[% authtypecode | html %]"; + const searchType = "[% marclist | html %]"; + const template_path = "[% interface | html %]/[% theme | html %]"; + <<<<<<< HEAD + const source = "[% source | html %]"; + ||||||| parent of e2e08310b98 (Bug 42281: Tidy all script tags - authorities (auto tidy)) + const source = + ======= + const source = + >>>>>>> e2e08310b98 (Bug 42281: Tidy all script tags - authorities (auto tidy))
Those merge conflict markers look rather untidy :) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Phil Ringnalda <phil@chetcolibrary.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |phil@chetcolibrary.org -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #196817|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #7 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 196908 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=196908&action=edit Bug 42281: Tidy all script tags - authorities (auto tidy) Patch from commit d06d4a3 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #8 from Jonathan Druart <jonathan.druart@gmail.com> --- (In reply to Phil Ringnalda from comment #6)
Those merge conflict markers look rather untidy :)
Fixed, thanks! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #9 from Phil Ringnalda <phil@chetcolibrary.org> --- Comment on attachment 196816 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=196816 Bug 42281: Tidy all script tags - authorities
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt + Koha.addPrefs({ + DefaultAuthorityTab: "[% DefaultAuthorityTab | html %]", + });
That breaks showing the DefaultAuthorityTab, since it's always "". Did you mean "[% Koha.Preference('DefaultAuthorityTab') | html %]" instead? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #196816|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #10 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197124 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197124&action=edit Bug 42281: Tidy all script tags - authorities In order to tidy all the script tags of the .tt files we isolate the interpolation of Template::Toolkit variables in a separate script tag. This patch focuses on the authority module. The 3 main changes are in the following files: * detail.tt * merge.tt * searchresultlist-auth.tt diff is trivial Note that authorities/authorities.tt is on a separate bug (bug 42284) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #196908|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #11 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197125 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197125&action=edit Bug 42281: Tidy all script tags - authorities (auto tidy) Patch from commit 2c0594a -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #12 from Jonathan Druart <jonathan.druart@gmail.com> --- (In reply to Phil Ringnalda from comment #9)
Comment on attachment 196816 [details] [review] Bug 42281: Tidy all script tags - authorities
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt + Koha.addPrefs({ + DefaultAuthorityTab: "[% DefaultAuthorityTab | html %]", + });
That breaks showing the DefaultAuthorityTab, since it's always "". Did you mean "[% Koha.Preference('DefaultAuthorityTab') | html %]" instead?
Yes, thanks again! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |41653 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41653 [Bug 41653] Stores for permissions and sysprefs should be under the Koha namespace -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Phil Ringnalda <phil@chetcolibrary.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #13 from Phil Ringnalda <phil@chetcolibrary.org> --- (In reply to Jonathan Druart from comment #8)
(In reply to Phil Ringnalda from comment #6)
Those merge conflict markers look rather untidy :)
Fixed, thanks!
Oops, wrong choice fixing the merge - now with "const source = " source is undefined and you can't choose an authority from the authority finder plugin. You wanted the "const source = "[% source | html %]";" one. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197124|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197125|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #14 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197551 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197551&action=edit Bug 42281: Tidy all script tags - authorities In order to tidy all the script tags of the .tt files we isolate the interpolation of Template::Toolkit variables in a separate script tag. This patch focuses on the authority module. The 3 main changes are in the following files: * detail.tt * merge.tt * searchresultlist-auth.tt diff is trivial Note that authorities/authorities.tt is on a separate bug (bug 42284) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #15 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197552 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197552&action=edit Bug 42281: Tidy all script tags - authorities (auto tidy) Patch from commit d15facb -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197551|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Paul Derscheid <paul.derscheid@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197552|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #16 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 197572 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197572&action=edit Bug 42281: Tidy all script tags - authorities In order to tidy all the script tags of the .tt files we isolate the interpolation of Template::Toolkit variables in a separate script tag. This patch focuses on the authority module. The 3 main changes are in the following files: * detail.tt * merge.tt * searchresultlist-auth.tt diff is trivial Note that authorities/authorities.tt is on a separate bug (bug 42284) Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #17 from Paul Derscheid <paul.derscheid@lmscloud.de> --- Created attachment 197573 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197573&action=edit Bug 42281: Tidy all script tags - authorities (auto tidy) Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197572|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197573|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #18 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197784 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197784&action=edit Bug 42281: Tidy all script tags - authorities In order to tidy all the script tags of the .tt files we isolate the interpolation of Template::Toolkit variables in a separate script tag. This patch focuses on the authority module. The 3 main changes are in the following files: * detail.tt * merge.tt * searchresultlist-auth.tt diff is trivial Note that authorities/authorities.tt is on a separate bug (bug 42284) Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #19 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 197785 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=197785&action=edit Bug 42281: Tidy all script tags - authorities (auto tidy) Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |21453 --- Comment #20 from Jonathan Druart <jonathan.druart@gmail.com> --- Rebased on top of bug 21453 that is PQA. Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21453 [Bug 21453] blinddetail-biblio-search.pl/.tt use hardcoded subfield values for MARC21 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jan Kissig <bibliothek@th-wildau.de> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |bibliothek@th-wildau.de |y.org | CC| |bibliothek@th-wildau.de -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jan Kissig <bibliothek@th-wildau.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jan Kissig <bibliothek@th-wildau.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197784|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jan Kissig <bibliothek@th-wildau.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #197785|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #21 from Jan Kissig <bibliothek@th-wildau.de> --- Created attachment 199216 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=199216&action=edit Bug 42281: Tidy all script tags - authorities In order to tidy all the script tags of the .tt files we isolate the interpolation of Template::Toolkit variables in a separate script tag. This patch focuses on the authority module. The 3 main changes are in the following files: * detail.tt * merge.tt * searchresultlist-auth.tt diff is trivial Note that authorities/authorities.tt is on a separate bug (bug 42284) Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> Signed-off-by: Jan Kissig <bibliothek@th-wildau.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #22 from Jan Kissig <bibliothek@th-wildau.de> --- Created attachment 199217 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=199217&action=edit Bug 42281: Tidy all script tags - authorities (auto tidy) Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> Signed-off-by: Jan Kissig <bibliothek@th-wildau.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Pedro Amorim (ammopt) <pedro.amorim@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply CC| |pedro.amorim@openfifth.co.u | |k -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #199217|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #23 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 201061 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=201061&action=edit Bug 42281: Tidy all script tags - authorities (auto tidy) Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de> Signed-off-by: Jan Kissig <bibliothek@th-wildau.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Pedro Amorim (ammopt) <pedro.amorim@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)| |26.11.00 released in| | Status|Passed QA |Pushed to main -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 --- Comment #24 from Pedro Amorim (ammopt) <pedro.amorim@openfifth.co.uk> --- Thanks everyone! Pushed to main for 26.11! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42281 Lucas Gass (lukeg) <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED CC| |lucas@bywatersolutions.com Status|Pushed to main |RESOLVED --- Comment #25 from Lucas Gass (lukeg) <lucas@bywatersolutions.com> --- Enhancement will not be backported to 26.05.x -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org