Bugzilla – Attachment 125743 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: Make BakerTaylorEnabled preference separate for staff and OPAC
Bug-28307-Make-BakerTaylorEnabled-preference-separ.patch (text/plain), 14.73 KB, created by
Lucas Gass (lukeg)
on 2021-10-05 15:25:46 UTC
(
hide
)
Description:
Bug 28307: Make BakerTaylorEnabled preference separate for staff and OPAC
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2021-10-05 15:25:46 UTC
Size:
14.73 KB
patch
obsolete
>From d7f5ecb98ce6b4a190c4a07c7027ecdf55e02b3a Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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 <lucas@bywatersolutions.com> >--- > catalogue/detail.pl | 22 +++++++++++++++++++ > .../bug-28307-BakerTaylorEnabled-staff.perl | 9 ++++++++ > .../admin/preferences/enhanced_content.pref | 12 +++++++--- > .../prog/en/modules/catalogue/detail.tt | 20 +++++++++++++++++ > .../prog/en/modules/catalogue/results.tt | 17 ++++++++++++++ > .../bootstrap/en/modules/opac-detail.tt | 19 +++++++++------- > opac/opac-detail.pl | 4 ++-- > 7 files changed, 90 insertions(+), 13 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug-28307-BakerTaylorEnabled-staff.perl > >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index b5801cca71..da1e9eb925 100755 >--- a/catalogue/detail.pl >+++ b/catalogue/detail.pl >@@ -39,6 +39,7 @@ use C4::Reserves; > use C4::Serials qw( CountSubscriptionFromBiblionumber SearchSubscriptions GetLatestSerials ); > use C4::XISBN qw( get_xisbns ); > use C4::External::Amazon qw( get_amazon_tld ); >+use C4::External::BakerTaylor qw( image_url link_url ); > use C4::Search qw( z3950_search_args enabled_staff_search_views ); > use C4::Tags qw( get_tags ); > use C4::XSLT qw( XSLTParse4Display ); >@@ -502,6 +503,27 @@ 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( > itemloop => \@itemloop, > otheritemloop => \@otheritemloop, >diff --git a/installer/data/mysql/atomicupdate/bug-28307-BakerTaylorEnabled-staff.perl b/installer/data/mysql/atomicupdate/bug-28307-BakerTaylorEnabled-staff.perl >new file mode 100644 >index 0000000000..5fc7869e30 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug-28307-BakerTaylorEnabled-staff.perl >@@ -0,0 +1,9 @@ >+$DBversion = 'XXX'; # will be replaced by the RM >+if( CheckVersion( $DBversion ) ) { >+ >+ $dbh->do("UPDATE systempreferences SET `variable` = 'OPACBakerTaylorEnabled', `explanation` = 'Enable or disable all Baker & Taylor features in the OPAC' WHERE `variable` = 'BakerTaylorEnabled'"); >+ $dbh->do("INSERT INTO systempreferences ( variable, value, explanation, options, type) VALUES ( 'BakerTaylorEnabled', '0', 'Enable or disable all Baker & Taylor features in the staff interface', NULL, 'YesNo' )"); >+ >+ # Always end with this (adjust the bug info) >+ NewVersion( $DBversion, 28307, "Bug 28307: Make BakerTaylorEnabled preference separate for staff and OPAC"); >+} >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 2e25114a35..4428369b2f 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 >@@ -80,20 +80,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 <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=BakerTaylorUsername">BakerTaylorUsername</a> and <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=BakerTaylorPassword">BakerTaylorPassword</a> (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 <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=BakerTaylorUsername">BakerTaylorUsername</a> and <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=BakerTaylorPassword">BakerTaylorPassword</a> (which will be publicly visible in image links). > - > - 'Baker and Taylor "My Library Bookstore" links should be accessed at <code>https://' > - pref: BakerTaylorBookstoreURL > class: url > - <em>isbn</em></code> (this should be filled in with something like <code>ocls.mylibrarybookstore.com/MLB/actions/searchHandler.do?nextPage=bookDetails&parentNum=10923&key=</code>). 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 7c2b961d6c..11b21da5da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -241,6 +241,23 @@ > </div> > [% 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" %] >+ <div class="cover-image" id="bakertaylor-coverimg"> >+ [% IF BakerTaylorBookstoreURL %] >+ <a href="https://[% Koha.Preference( BakerTaylorBookstoreURL ) | url %][% bt_id | url %]"> >+ <img alt="See Baker & Taylor" src=" [% BakerTaylorImageURL | url %]" /> >+ </a> >+ [% ELSE %] >+ <a href="[% BakerTaylorImageURL | url %]"> >+ <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | url %]" /> >+ </a> >+ [% END %] >+ <div class="hint">Image from Baker & Taylor</div> >+ </div> >+ [% END %] >+ > [% IF Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL') %] > [% SET custom_cover_image_url = biblio.custom_cover_image_url %] > [% IF custom_cover_image_url %] >@@ -1080,6 +1097,9 @@ Note that permanent location is a code, and location may be an authval. > lightbox_descriptions.push(coce_description); > } else if ( div.attr("id") == "adlibris-coverimg" ){ > lightbox_descriptions.push(_("Image from Adlibris (<a href='%s'>see the original image</a>)").format($(img).data('link'))); >+ >+ } 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 (<a href='%s'>edit</a>)").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 4764f4f409..636360a4e0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -475,6 +475,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" %] >+ <div class="cover-image bakertaylor-coverimg" id="bakertaylor-coverimg"> >+ [% IF BakerTaylorBookstoreURL %] >+ <a href="https://[% Koha.Preference( BakerTaylorBookstoreURL ) | url %][% bt_id | url %]"> >+ <img alt="See Baker & Taylor" src=" [% BakerTaylorImageURL | url %]" /> >+ </a> >+ [% ELSE %] >+ <a href="[% BakerTaylorImageURL | url %]"> >+ <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | url %]" /> >+ </a> >+ [% END %] >+ <div class="hint">Image from Baker & Taylor</div> >+ </div> >+ [% 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 fe2b35da26..cf11e81480 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -101,16 +101,19 @@ > <div title="[% img_title | html %]" class="[% normalized_isbn | html %]" id="openlibrary-thumbnail-preview"></div> > [% END %] > [% bt_id = ( normalized_upc || normalized_isbn ) %] >- [% IF ( BakerTaylorEnabled && bt_id ) %] >- [% IF BakerTaylorBookstoreURL %] >- [% IF ( OPACURLOpenInNewWindow ) %] >- <a href="https://[% BakerTaylorBookstoreURL | url %][% bt_id | url %]" target="_blank" rel="noreferrer"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ [% IF ( OPACBakerTaylorEnabled && bt_id ) %] >+ <div class="cover-image" id="bakertaylor-coverimg"> >+ [% IF BakerTaylorBookstoreURL %] >+ <a href="https://[% BakerTaylorBookstoreURL | url %][% bt_id | url %]"> >+ <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> >+ </a> > [% ELSE %] >- <a href="https://[% BakerTaylorBookstoreURL | url %][% bt_id | url %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ <a href="[% BakerTaylorImageURL | url %][% bt_id | uri%]"> >+ <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> >+ </a> > [% END %] >- [% ELSE %] >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /> >- [% END %] >+ <div class="hint">Image from Baker & Taylor</div> >+ </div> > [% END %] > [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] > [% SET custom_cover_image_url = biblio.custom_cover_image_url %] >diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl >index 0860aa487a..3b60464f7b 100755 >--- a/opac/opac-detail.pl >+++ b/opac/opac-detail.pl >@@ -1116,9 +1116,9 @@ if (C4::Context->preference("OPACShelfBrowser")) { > > $template->param( AmazonTld => get_amazon_tld() ) if ( C4::Context->preference("OPACAmazonCoverImages")); > >-if (C4::Context->preference("BakerTaylorEnabled")) { >+if (C4::Context->preference("OPACBakerTaylorEnabled")) { > $template->param( >- BakerTaylorEnabled => 1, >+ OPACBakerTaylorEnabled => 1, > BakerTaylorImageURL => &image_url(), > BakerTaylorLinkURL => &link_url(), > BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'), >-- >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