From 28ee641d92e8848f3e423044b2d97bcad27c995f Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 19 Apr 2023 13:07:25 +0000 Subject: [PATCH] Bug 32680: (QA follow-up) Fix opac call and remove second fetch Signed-off-by: Nick Clemens --- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 +--- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 ++---- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 ++---- 4 files changed, 6 insertions(+), 12 deletions(-) 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 9ee61c05cf..60a2944610 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -2448,8 +2448,6 @@ }); [% END %] - [% IF ( CoverImagePlugins ) %] - [% KohaPlugins.get_plugins_intranet_cover_images | $raw %] - [% END %] + [% CoverImagePlugins | $raw %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 67f09c5603..290224e76f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -914,7 +914,7 @@ [% END %] [% Asset.js("js/pages/results.js") | $raw %] - [% KohaPlugins.get_plugins_intranet_cover_images | $raw %] + [% CoverImagePlugins | $raw %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] 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 02b72cfeb6..ae49613297 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -9,7 +9,7 @@ [% USE KohaPlugins %] [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnDetail ) %] [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnDetail ) %] -[% SET CoverImagePlugins = KohaPlugins.get_plugins_intranet_cover_images %] +[% SET CoverImagePlugins = KohaPlugins.get_plugins_opac_cover_images %] [% IF Koha.Preference('AmazonAssocTag') %] [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %] [% ELSE %] @@ -1456,9 +1456,7 @@ [% Asset.js("js/ratings.js") | $raw %] [% END %] - [% IF ( CoverImagePlugins ) %] - [% KohaPlugins.get_plugins_opac_cover_images | $raw %] - [% END %] + [% CoverImagePlugins | $raw %] [% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") | $raw %][% END %] [% IF ( Koha.Preference('OPACDetailQRCode') ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 0d1e8fcae9..77816dd377 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -5,7 +5,7 @@ [% USE To %] [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnList ) %] [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnList ) %] -[% SET CoverImagePlugins = KohaPlugins.get_plugins_intranet_cover_images %] +[% SET CoverImagePlugins = KohaPlugins.get_plugins_opac_cover_images %] [% IF firstPage %] [% SET OverDriveEnabled = Koha.Preference('OverDriveLibraryID') && Koha.Preference('OverDriveClientKey') && Koha.Preference('OverDriveClientSecret') %] @@ -591,9 +591,7 @@ [% IF OpenLibraryCovers || OpenLibrarySearch %] [% Asset.js("js/openlibrary.js") | $raw %] [% END %] - [% IF ( CoverImagePlugins ) %] - [% KohaPlugins.get_plugins_opac_cover_images | $raw %] - [% END %] + [% CoverImagePlugins | $raw %]