From e76c1a066cf3ab9cfd373417c622770d9de54ea9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 10 May 2021 15:30:51 +0000 Subject: [PATCH] Bug 28307: Make BakerTaylorEnabled preference separate for staff and OPAC This patch updates the system preferences controlling Baker & Taylor content so that there are separate preferences for the OPAC and the staff interface. The patch also adds Baker & Taylor cover images to the staff client. To test, apply the patch and run the database update. - Go to Admnistration -> System preferences -> Enhanced content - You should see a BakerTaylorEnabled and a OPACBakerTaylorEnabled preference. The OPACBakerTaylorEnabled should have the same setting you previously had for BakerTaylorEnabled. The BakerTaylorEnabled preference should be turned off. - Note that the description of the preferences have been updated to include links to the Baker & Taylor username and password preferences. - Enable both and make sure you have a valid Baker & Taylor username and password entered. - Perform a search in both the OPAC and staff interface. A Baker & Taylor cover image should appear on the bibliographic detail page in the OPAC, and on the search results and bibliographic detail page in the staff interface. Signed-off-by: Lucas Gass --- catalogue/detail.pl | 23 ++++++++++++ .../bug-28307-BakerTaylorEnabled-staff.pl | 36 +++++++++++++++++++ .../admin/preferences/enhanced_content.pref | 12 +++++-- .../prog/en/modules/catalogue/detail.tt | 19 ++++++++++ .../prog/en/modules/catalogue/results.tt | 17 +++++++++ .../bootstrap/en/modules/opac-detail.tt | 2 +- opac/opac-detail.pl | 14 ++++---- 7 files changed, 112 insertions(+), 11 deletions(-) create mode 100755 installer/data/mysql/atomicupdate/bug-28307-BakerTaylorEnabled-staff.pl diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 9a1306cf05..85eb2e0bad 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -39,6 +39,7 @@ use C4::Serials qw( CountSubscriptionFromBiblionumber SearchSubscriptions GetLat use C4::XISBN qw( get_xisbns ); use C4::External::Amazon qw( get_amazon_tld ); use C4::Search qw( z3950_search_args enabled_staff_search_views new_record_from_zebra ); +use C4::External::BakerTaylor qw( image_url link_url ); use C4::Tags qw( get_tags ); use C4::XSLT qw( XSLTParse4Display ); use Koha::DateUtils qw( format_sqldatetime ); @@ -390,6 +391,28 @@ foreach ( keys %{$dat} ) { # does not work: my %views_enabled = map { $_ => 1 } $template->query(loop => 'EnableViews'); # method query not found?!?! $template->param( AmazonTld => get_amazon_tld() ) if ( C4::Context->preference("AmazonCoverImages")); + +if ( C4::Context->preference("BakerTaylorEnabled") ) { + $template->param( + BakerTaylorEnabled => 1, + BakerTaylorImageURL => &image_url(), + BakerTaylorLinkURL => &link_url(), + BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'), + ); + my ( $bt_user, $bt_pass ); + if ( $isbn + and $bt_user = C4::Context->preference('BakerTaylorUsername') + and $bt_pass = C4::Context->preference('BakerTaylorPassword') ) + { + $template->param( + BakerTaylorContentURL => sprintf( + "https://contentcafe2.btol.com/ContentCafeClient/ContentCafe.aspx?UserID=%s&Password=%s&ItemKey=%s&Options=Y", + $bt_user, $bt_pass, $isbn + ) + ); + } +} + $template->param( biblionumber => $biblionumber, ($analyze? 'analyze':'detailview') =>1, diff --git a/installer/data/mysql/atomicupdate/bug-28307-BakerTaylorEnabled-staff.pl b/installer/data/mysql/atomicupdate/bug-28307-BakerTaylorEnabled-staff.pl new file mode 100755 index 0000000000..ec2dcb6aba --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug-28307-BakerTaylorEnabled-staff.pl @@ -0,0 +1,36 @@ +use Modern::Perl; +use Koha::Installer::Output qw(say_warning say_failure say_success say_info); + +return { + bug_number => "28307", + description => "Make BakerTaylorEnabled preference separate for staff and OPAC", + up => sub { + my ($args) = @_; + my ( $dbh, $out ) = @$args{qw(dbh out)}; + + # Get any existing value from the IntranetmainUserblock system preference + my ($bakertaylorenabled) = $dbh->selectrow_array( + q| + SELECT value FROM systempreferences WHERE variable='BakerTaylorEnabled'; + | + ); + + $dbh->do("DELETE FROM systempreferences WHERE variable='BakerTaylorEnabled'"); + + $dbh->do( + q{ + INSERT IGNORE INTO systempreferences ( variable, value, explanation, options, type) VALUES ( 'OPACBakerTaylorEnabled', ?, 'Enable or disable all Baker & Taylor features in the OPAC', NULL, 'YesNo' ) + }, undef, $bakertaylorenabled + ); + $dbh->do( + q{ + INSERT IGNORE INTO systempreferences ( variable, value, explanation, options, type) VALUES ( 'BakerTaylorEnabled', ?, 'Enable or disable all Baker & Taylor features in the staff interface', NULL, 'YesNo' ) + }, undef, $bakertaylorenabled + ); + + say_success( + $out, + "Added new system preference 'OPACBakerTaylorEnabled' to allow separate OPAC and staff interface settings" + ); + }, +}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref index e463f1657c..fef58f1edc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref @@ -64,20 +64,26 @@ Enhanced content: - pref: Babeltheque_url_update class: url - (e.g. http://www.babeltheque.com/.../file.csv.bz2). - Baker and Taylor: + Baker & Taylor: - - pref: BakerTaylorEnabled choices: 1: Add 0: "Don't add" - - Baker and Taylor links and cover images to the OPAC and staff interface. This requires that you have entered in a username and password (which can be seen in image links). + - Baker & Taylor links and cover images to the staff interface. This requires that you have entered your BakerTaylorUsername and BakerTaylorPassword (which will be publicly visible in image links). + - + - pref: OPACBakerTaylorEnabled + choices: + 1: Add + 0: "Don't add" + - Baker & Taylor links and cover images to the OPAC. This requires that you have entered your BakerTaylorUsername and BakerTaylorPassword (which will be publicly visible in image links). - - 'Baker and Taylor "My Library Bookstore" links should be accessed at https://' - pref: BakerTaylorBookstoreURL class: url - isbn (this should be filled in with something like ocls.mylibrarybookstore.com/MLB/actions/searchHandler.do?nextPage=bookDetails&parentNum=10923&key=). Leave it blank to disable these links. - - - Access Baker and Taylor using username + - Access Baker & Taylor using username - pref: BakerTaylorUsername class: password - and password 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 4642696270..2c43ecb08b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -287,6 +287,23 @@ [% END %] [% END %] + [% bt_id = ( normalized_upc || normalized_isbn ) %] + [% IF ( Koha.Preference('BakerTaylorEnabled') && bt_id ) %] + [% SET BakerTaylorImageURL = "https://contentcafe2.btol.com/ContentCafe/Jacket.aspx?UserID=${ Koha.Preference('BakerTaylorUsername') }&Password=${ Koha.Preference('BakerTaylorPassword') }&Options=Y&Return=T&Type=S&Value=$bt_id" %] +
+ [% IF BakerTaylorBookstoreURL %] + + See Baker & Taylor + + [% ELSE %] + + See Baker & Taylor + + [% END %] +
Image from Baker & Taylor
+
+ [% END %] + [% IF Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL') %] [% SET custom_cover_image_url = biblio.custom_cover_image_url %] [% IF custom_cover_image_url %] @@ -1341,6 +1358,8 @@ } div.find(".hint").html(coce_description); lightbox_descriptions.push(coce_description); + } else if ( div.attr("id") == "bakertaylor-coverimg" ){ + lightbox_descriptions.push(_("Image from Baker & Taylor")); } else if ( div.attr("class") == "cover-image local-coverimg" ) { lightbox_descriptions.push(_("Local cover image (edit)").format($(img).data('link'))); } else { 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 91db336895..070dac00b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -521,6 +521,23 @@ [% END %] [% END %] + [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] + [% IF ( Koha.Preference('BakerTaylorEnabled') && bt_id ) %] + [% SET BakerTaylorImageURL = "https://contentcafe2.btol.com/ContentCafe/Jacket.aspx?UserID=${ Koha.Preference('BakerTaylorUsername') }&Password=${ Koha.Preference('BakerTaylorPassword') }&Options=Y&Return=T&Type=S&Value=$bt_id" %] +
+ [% IF BakerTaylorBookstoreURL %] + + See Baker & Taylor + + [% ELSE %] + + See Baker & Taylor + + [% END %] +
Image from Baker & Taylor
+
+ [% END %] + [% IF Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL') %] [% SET custom_cover_image_url = SEARCH_RESULT.biblio_object.custom_cover_image_url %] [% IF custom_cover_image_url %] 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 7dd44416f5..5628b6f8a7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -116,7 +116,7 @@ [% END %] [% bt_id = ( normalized_upc || normalized_isbn ) %] - [% IF ( BakerTaylorEnabled && bt_id ) %] + [% IF ( OPACBakerTaylorEnabled && bt_id ) %]