From 29255972391e772e7c6aaeb8a325af43d7c49819 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 13 Jun 2017 22:15:13 +0000 Subject: [PATCH] Bug 18798: Use Koha.Preference in OPAC Reading Record This patch uses the Koha.Preference plugin method for the following sysprefs: - OPACMySummaryHTML - OPACAmazonCoverImages - SyndeticsEnabled - SyndeticsCoverImages - SyndeticsClientCode - GoogleJackets - BakerTaylorEnabled - BakerTaylorBookstoreURL To test confirm that enabling and disabling the above sysprefs does not break anything. Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard I'm not able to test Syndetics but everything else works correctly. --- .../bootstrap/en/modules/opac-readingrecord.tt | 10 +++++----- opac/opac-readingrecord.pl | 14 +++----------- 2 files changed, 8 insertions(+), 16 deletions(-) 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 cb78b38bb0..a831e0ceca 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -139,7 +139,7 @@ [% SET normalized_isbn = biblio.normalized_isbn %] - [% IF OPACAmazonCoverImages %] + [% IF Koha.Preference('OPACAmazonCoverImages') %] [% IF normalized_isbn %] [% ELSE %] @@ -157,13 +157,13 @@ [% END %] [% END %] - [% IF BakerTaylorEnabled || SyndeticsEnabled && SyndeticsCoverImages %] + [% IF Koha.Preference( "BakerTaylorEnabled" ) || Koha.Preference( "SyndeticsEnabled" ) && Koha.Preference( "SyndeticsCoverImages" ) %] [% SET normalized_upc = biblio.normalized_upc %] [% END %] - [% IF BakerTaylorEnabled %] + [% IF Koha.Preference( "BakerTaylorEnabled" ) %] [% bt_id = ( normalized_upc || normalized_isbn ) %] [% IF ( bt_id ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl index c08a8740e0..4fe1622bc1 100755 --- a/opac/opac-readingrecord.pl +++ b/opac/opac-readingrecord.pl @@ -89,20 +89,12 @@ my $old_checkouts = [ if ( C4::Context->preference('BakerTaylorEnabled') ) { $template->param( - JacketImages => 1, - BakerTaylorEnabled => 1, - BakerTaylorImageURL => &image_url(), - BakerTaylorLinkURL => &link_url(), - BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'), + JacketImages => 1, + BakerTaylorImageURL => &image_url(), + BakerTaylorLinkURL => &link_url(), ); } -for (qw(AmazonCoverImages GoogleJackets)) { # BakerTaylorEnabled handled above - C4::Context->preference($_) or next; - $template->param( $_ => 1 ); - $template->param( JacketImages => 1 ); -} - my $saving_display = C4::Context->preference('OPACShowSavings'); if ( $saving_display =~ /checkouthistory/ ) { $template->param( savings => $patron->get_savings ); -- 2.39.5