Bugzilla – Attachment 127225 Details for
Bug 28307
Enable BakerTaylorEnabled content in the staff interface with separate system preference
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28307: (follow-up) Correct OPAC references to OPACBakerTaylorEnabled
Bug-28307-follow-up-Correct-OPAC-references-to-OPA.patch (text/plain), 27.28 KB, created by
Owen Leonard
on 2021-11-02 18:02:03 UTC
(
hide
)
Description:
Bug 28307: (follow-up) Correct OPAC references to OPACBakerTaylorEnabled
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2021-11-02 18:02:03 UTC
Size:
27.28 KB
patch
obsolete
>From 5b6e758ba65f706c70b873e8e38b4b0da9f76a05 Mon Sep 17 00:00:00 2001 >From: Owen <oleonard@myacpl.org> >Date: Tue, 2 Nov 2021 13:48:43 +0000 >Subject: [PATCH] Bug 28307: (follow-up) Correct OPAC references to > OPACBakerTaylorEnabled > >This patch adds the new OPACBakerTaylorEnabled preferences to OPAC >templates and scripts which were missed in the first patch. The patch >also adds OPACBakerTaylorEnabled to UsageStats.pm and sysprefs.sql. > >Check these pages in the OPAC: > > - Catalog -> Search results > - And search results -> RSS > - Catalog -> Bibliographic details page -> Shelf browser > - Catalog -> Lists -> List contents > - Catalog -> Recent comments > - And recent comments -> RSS > - Your summary -> Checkouts and Overdues >--- > C4/UsageStats.pm | 1 + > installer/data/mysql/mandatory/sysprefs.sql | 1 + > .../bootstrap/en/includes/opac-bottom.inc | 2 +- > .../bootstrap/en/includes/shelfbrowser.inc | 14 +++++------ > .../bootstrap/en/modules/opac-opensearch.tt | 2 +- > .../en/modules/opac-readingrecord.tt | 12 ++++++---- > .../bootstrap/en/modules/opac-results.tt | 21 +++++----------- > .../bootstrap/en/modules/opac-shelves.tt | 20 +++++----------- > .../en/modules/opac-showreviews-rss.tt | 4 +++- > .../bootstrap/en/modules/opac-showreviews.tt | 11 +++++---- > .../bootstrap/en/modules/opac-user.tt | 24 +++++++++++-------- > opac/opac-readingrecord.pl | 6 ++--- > opac/opac-search.pl | 4 +--- > opac/opac-shelves.pl | 2 +- > opac/opac-showreviews.pl | 8 +++++++ > opac/opac-user.pl | 6 ++--- > 16 files changed, 67 insertions(+), 71 deletions(-) > >diff --git a/C4/UsageStats.pm b/C4/UsageStats.pm >index 2ff5303bcb..8f14fdebc0 100644 >--- a/C4/UsageStats.pm >+++ b/C4/UsageStats.pm >@@ -250,6 +250,7 @@ sub _shared_preferences { > OPACAmazonCoverImages > Babeltheque > BakerTaylorEnabled >+ OPACBakerTaylorEnabled > GoogleJackets > HTML5MediaEnabled > LibraryThingForLibrariesEnabled >diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql >index 9789af312e..a0e3289c99 100644 >--- a/installer/data/mysql/mandatory/sysprefs.sql >+++ b/installer/data/mysql/mandatory/sysprefs.sql >@@ -394,6 +394,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('OPACAllowUserToChooseBranch','1','1','Allow the user to choose the branch they want to pickup their hold from','YesNo'), > ('OPACAmazonCoverImages','0','','Display cover images on OPAC from Amazon Web Services','YesNo'), > ('OpacAuthorities','1',NULL,'If ON, enables the search authorities link on OPAC','YesNo'), >+('OPACBakerTaylorEnabled','0','','Enable or disable all Baker & Taylor features in the OPAC.','YesNo'), > ('OPACBaseURL','',NULL,'Specify the Base URL of the OPAC, e.g., http://opac.mylibrary.com, including the protocol (http:// or https://). Otherwise, the http:// will be added automatically by Koha upon saving.','Free'), > ('opacbookbag','1','','If ON, enables display of Cart feature','YesNo'), > ('OpacBrowser','0',NULL,'If ON, enables subject authorities browser on OPAC (needs to set misc/cronjob/sbuild_browser_and_cloud.pl)','YesNo'), >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 e4aaccf54a..c040e38ad4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -269,7 +269,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > </script> > [% END %] > >-[% IF ( BakerTaylorEnabled ) %] >+[% IF ( OPACBakerTaylorEnabled ) %] > [% Asset.js("js/bakertaylorimages.js") | $raw %] > <script> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >index 84f2b3082c..bcc4cf41c9 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >@@ -28,7 +28,7 @@ > [% img_title = item.biblionumber %] > [% END %] > >- [% IF ( OPACLocalCoverImages || OPACAmazonCoverImages || ( SyndeticsEnabled && SyndeticsCoverImages ) || GoogleJackets || BakerTaylorEnabled || ( Koha.Preference('OpacCoce') && Koha.Preference('CoceProviders') ) || ( Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') ) ) %] >+ [% IF ( OPACLocalCoverImages || OPACAmazonCoverImages || ( SyndeticsEnabled && SyndeticsCoverImages ) || GoogleJackets || Koha.Preference('OPACBakerTaylorEnabled') || ( Koha.Preference('OpacCoce') && Koha.Preference('CoceProviders') ) || ( Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') ) ) %] > <a class="shelfbrowser_cover" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]&shelfbrowse_itemnumber=[% item.itemnumber | uri %]#shelfbrowser"> > [% IF ( OPACLocalCoverImages ) %] > <div title="[% img_title | html %]" class="[% item.biblionumber | html %] thumbnail-shelfbrowser" id="local-thumbnail-shelf-[% item.biblionumber | html %]"></div> >@@ -62,14 +62,12 @@ > [% coce_id = item.browser_normalized_ean || item.browser_normalized_isbn | html %] > <div title="[% img_title | html %]" class="[% coce_id | html %]" id="coce-thumbnail-preview-[% coce_id | html %]"></div> > [% END %] >- [% IF ( BakerTaylorEnabled ) %] >- [% bt_id = ( item.browser_normalized_upc || item.browser_normalized_isbn ) | html %] >- [% IF ( bt_id ) %] >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /> >- [% ELSE %] >- <span class="no-image">No cover image available</span> >- [% END %] >+ >+ [% bt_id = ( item.browser_normalized_upc || item.browser_normalized_isbn ) %] >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] >+ > [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] > [% SET custom_cover_image_url = item.biblio_object.custom_cover_image_url %] > [% IF custom_cover_image_url %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >index 3d3ac81ed5..8d84bab869 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >@@ -58,7 +58,7 @@ > [% END %][% END %][% END %] > > [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] >-[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL |url %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |url %][% bt_id | uri %]" /></a>[% END %][% END %] >+[% IF ( OPACBakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL |url %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |url %][% bt_id | uri %]" /></a>[% END %][% END %] > > [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] > [% SET custom_cover_image_url = SEARCH_RESULT.biblio_object.custom_cover_image_url %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >index 4033ab12b4..21e73ad4cd 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >@@ -122,12 +122,14 @@ > [% END %] > [% END %] > >- [% IF BakerTaylorEnabled %] >- [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) %] >- [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) %] >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ [% IF ( BakerTaylorLinkURL ) %] >+ <a href="https://[% BakerTaylorLinkURL | url %][% bt_id | url %]"> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> >+ </a> > [% ELSE %] >- <span class="no-image">No cover image available</span> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] > [% END %] > >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 c71015b2cd..1c29516dd0 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -400,25 +400,16 @@ > <span class="no-image">No cover image available</span> > [% END %] > [% END %] >- >- [% IF ( BakerTaylorEnabled && !BakerTaylorBookstoreURL ) %] >- [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] >- [% IF ( bt_id ) %] >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /> >- [% ELSE %] >- <span class="no-image">No cover image available</span> >- [% END %] >- [% END %] > </a> > >- [% IF ( BakerTaylorEnabled && BakerTaylorBookstoreURL ) %] >- [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] >- [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL | url %][% bt_id | url %]"> >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /> >+ [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ [% IF ( BakerTaylorLinkURL ) %] >+ <a href="https://[% BakerTaylorLinkURL | url %][% bt_id | url %]"> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > </a> > [% ELSE %] >- <span class="no-image">No cover image available</span> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] > [% END %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >index 936a178442..d0019c9884 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >@@ -437,23 +437,15 @@ > [% END %] > > </a> <!-- / .p1 --> >- [% IF ( Koha.Preference('BakerTaylorEnabled') && !Koha.Preference('BakerTaylorBookstoreURL') ) %] >- [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %] >- [% IF ( bt_id ) %] >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /> >- [% ELSE %] >- <span class="no-image">No cover image available</span> >- [% END %] >- [% END %] > >- [% IF ( Koha.Preference('BakerTaylorEnabled') && Koha.Preference('BakerTaylorBookstoreURL') ) %] >- [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %] >- [% IF ( bt_id ) %] >- <a href="https://[% Koha.Preference('BakerTaylorBookstoreURL') | uri %][% bt_id | uri %]"> >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /> >+ [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %] >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ [% IF ( BakerTaylorLinkURL ) %] >+ <a href="https://[% BakerTaylorLinkURL | url %][% bt_id | url %]"> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > </a> > [% ELSE %] >- <span class="no-image">No cover image available</span> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] > [% END %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >index e615310834..c899bc7450 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >@@ -17,7 +17,9 @@ > [% END %][% END %][% END %] > > [% bt_id = ( review.normalized_upc || review.normalized_isbn ) %] >-[% IF ( BakerTaylorEnabled && bt_id ) %]<a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>[% END %] >+[% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ <a href="https://[% BakerTaylorLinkURL | uri %][% bt_id | uri %]"><img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+[% END %] > > [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] > [% SET custom_cover_image_url = review.biblio_object.custom_cover_image_url %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >index 9cb5f5a753..03a9086e58 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >@@ -144,12 +144,15 @@ > [% END %] > [% END %] > </a> >+ > [% bt_id = ( review.normalized_upc || review.normalized_isbn ) %] >- [% IF ( BakerTaylorEnabled ) %] >- [% IF ( bt_id ) %] >- <a href="https://[% review.BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% review.BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ [% IF ( BakerTaylorLinkURL ) %] >+ <a href="https://[% BakerTaylorLinkURL | url %][% bt_id | url %]"> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> >+ </a> > [% ELSE %] >- <span class="no-image">No cover image available</span> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] > [% END %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 53b4400c66..3347e66389 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -297,12 +297,14 @@ > [% END %] > [% END %] > >- [% IF ( BakerTaylorEnabled ) %] >- [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) %] >- [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) %] >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ [% IF ( BakerTaylorLinkURL ) %] >+ <a href="https://[% BakerTaylorLinkURL | url %][% bt_id | url %]"> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> >+ </a> > [% ELSE %] >- <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! --> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] > [% END %] > >@@ -672,12 +674,14 @@ > [% END %] > [% END %] > >- [% IF ( BakerTaylorEnabled ) %] >- [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) %] >- [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) %] >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ [% IF ( BakerTaylorLinkURL ) %] >+ <a href="https://[% BakerTaylorLinkURL | url %][% bt_id | url %]"> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> >+ </a> > [% ELSE %] >- <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! --> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] > [% END %] > >diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl >index 3652d000c7..d5678cc907 100755 >--- a/opac/opac-readingrecord.pl >+++ b/opac/opac-readingrecord.pl >@@ -129,17 +129,15 @@ foreach my $issue ( @{$issues} ) { > } > } > >-if (C4::Context->preference('BakerTaylorEnabled')) { >+if (C4::Context->preference('OPACBakerTaylorEnabled')) { > $template->param( > JacketImages=>1, >- BakerTaylorEnabled => 1, > BakerTaylorImageURL => &image_url(), > BakerTaylorLinkURL => &link_url(), >- BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'), > ); > } > >-for(qw(AmazonCoverImages GoogleJackets)) { # BakerTaylorEnabled handled above >+for(qw(AmazonCoverImages GoogleJackets)) { # OPACBakerTaylorEnabled handled above > C4::Context->preference($_) or next; > $template->param($_=>1); > $template->param(JacketImages=>1); >diff --git a/opac/opac-search.pl b/opac/opac-search.pl >index 8f93d68984..a494f6b3cc 100755 >--- a/opac/opac-search.pl >+++ b/opac/opac-search.pl >@@ -158,12 +158,10 @@ $template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResults > $template->param( > OpacStarRatings => C4::Context->preference("OpacStarRatings") ); > >-if (C4::Context->preference('BakerTaylorEnabled')) { >+if (C4::Context->preference('OPACBakerTaylorEnabled')) { > $template->param( >- BakerTaylorEnabled => 1, > BakerTaylorImageURL => &image_url(), > BakerTaylorLinkURL => &link_url(), >- BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'), > ); > } > >diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl >index 78ce49da0e..32df26e36d 100755 >--- a/opac/opac-shelves.pl >+++ b/opac/opac-shelves.pl >@@ -75,7 +75,7 @@ if( $op eq 'view' || $op eq 'list' ){ > }); > } > >-if (C4::Context->preference("BakerTaylorEnabled")) { >+if (C4::Context->preference("OPACBakerTaylorEnabled")) { > $template->param( > BakerTaylorImageURL => &image_url(), > BakerTaylorLinkURL => &link_url(), >diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl >index e6aab17d60..6b3911929f 100755 >--- a/opac/opac-showreviews.pl >+++ b/opac/opac-showreviews.pl >@@ -31,6 +31,7 @@ use C4::Koha qw( > use C4::Output qw( output_html_with_http_headers ); > use C4::Biblio qw( GetMarcBiblio ); > use Koha::DateUtils qw( dt_from_string ); >+use C4::External::BakerTaylor qw( image_url link_url ); > use Koha::Patrons; > use Koha::Reviews; > use POSIX qw( ceil floor ); >@@ -188,6 +189,13 @@ $template->param( PAGE_NUMBERS => \@page_numbers, > previous_page_offset => $previous_page_offset) unless $pages < 2; > $template->param(next_page_offset => $next_page_offset) unless $pages eq $current_page_number; > >+if (C4::Context->preference("OPACBakerTaylorEnabled")) { >+ $template->param( >+ BakerTaylorImageURL => &image_url(), >+ BakerTaylorLinkURL => &link_url(), >+ ); >+} >+ > $template->param( > reviews => $reviews, > results_per_page => $results_per_page, >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index 3b72d2fb98..04542903c7 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -330,18 +330,16 @@ $template->param( > showpriority => $show_priority, > ); > >-if (C4::Context->preference('BakerTaylorEnabled')) { >+if (C4::Context->preference('OPACBakerTaylorEnabled')) { > $template->param( >- BakerTaylorEnabled => 1, > BakerTaylorImageURL => &image_url(), > BakerTaylorLinkURL => &link_url(), >- BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'), > ); > } > > if (C4::Context->preference("OPACAmazonCoverImages") or > C4::Context->preference("GoogleJackets") or >- C4::Context->preference("BakerTaylorEnabled") or >+ C4::Context->preference("OPACBakerTaylorEnabled") or > C4::Context->preference("SyndeticsCoverImages") or > ( C4::Context->preference('OPACCustomCoverImages') and C4::Context->preference('CustomCoverImagesURL') ) > ) { >-- >2.20.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 28307
:
123198
|
125708
|
125743
|
125744
|
127222
|
127223
|
127224
|
127225
|
131784
|
131785
|
131786
|
133274
|
133275
|
133276
|
138137
|
138138
|
138139
|
142193
|
142194
|
142195
|
169061
|
169062
|
169063
|
175257
|
175258
|
175259
|
175265