From a95a84ae7aaedd4139b9a829a5c80d3fa7e17f98 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 22 Apr 2025 11:19:55 +0100 Subject: [PATCH] Bug 38010: (QA follow-up) Move island hydration to container wrapper Signed-off-by: Michaela Sieber Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/en/includes/acquisitions-menu.inc | 7 ------- .../intranet-tmpl/prog/en/includes/main-container.inc | 7 +++++++ koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc | 2 -- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index 7da6a9e3d29..fdb621072b3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -21,10 +21,3 @@ marcorderautomation="[% Koha.Preference('MarcOrderingAutomation') | html %]" marcordermanage="[% CAN_user_acquisition_marc_order_manage | html %]" > - -[% SET islands = Asset.js("js/vue/dist/islands.esm.js").match('(src="([^"]+)")').1 %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc index 9a614fc4d61..46da5307fa0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc @@ -1,4 +1,5 @@ [% USE raw %] +[% USE Asset %]
[% IF aside && !asides %] @@ -82,3 +83,9 @@ [% END %]
+[% SET islands = Asset.js("js/vue/dist/islands.esm.js").match('(src="([^"]+)")').1 %] + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc index 8ee596a062a..05b979c1c09 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc @@ -11,5 +11,3 @@ contractsmanage="[% CAN_user_acquisition_contracts_manage | html %]" issuemanage="[% CAN_user_acquisition_issue_manage | html %]" > - -[% Asset.js("js/vue/dist/islands.js", "init" => "1") | $raw %] -- 2.34.1