From cdb8a85be566cd6371343fbb0105291602371c2b Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Date: Sun, 22 Jul 2018 19:00:40 -0400 Subject: [PATCH] LP#1772680: Fixed issues with advanced search, Tab name, and wishlist Signed-off-by: Jaswinder Singh Signed-off-by: Galen Charlton LP#1772680: Minor fixes Signed-off-by: Jaswinder Singh Signed-off-by: Galen Charlton --- .../lib/OpenILS/Application/EbookAPI/RBDigital.pm | 3 ++- Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm | 3 +-- .../lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm | 16 ++++++++++++++++ .../opac/ebook_api/rbdigital/parts/item_parser.tt2 | 8 ++++---- Open-ILS/src/templates/opac/myopac/ebook_checkout.tt2 | 0 Open-ILS/src/templates/opac/parts/myopac/base.tt2 | 2 +- Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 | 9 +++++++++ 7 files changed, 33 insertions(+), 8 deletions(-) mode change 100644 => 100755 Open-ILS/src/templates/opac/myopac/ebook_checkout.tt2 diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm index f851f7eed8..5f4094673b 100755 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm @@ -298,7 +298,8 @@ sub _build_search_URI { $media_format = ''; } - if ($media_format eq 'eaudio' || $media_format eq 'ebook' || $media_format eq '') { + if (($media_format eq 'eaudio' || $media_format eq 'ebook' || $media_format eq '') + && scalar (@$search_inputs) == 0) { my $search_term = ''; if ($search_type eq 'author' || $search_type eq 'genre') { $search_term = "&$search_type=$value_to_search"; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm index 8a914094ff..b588e5ec88 100755 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm @@ -455,13 +455,12 @@ sub load_rbdigital_common { # Send back rbdigital_patron_id $self->ctx->{rbdigital_patron_id} = _get_patron_id($self->editor->authtoken, $session_id); $logger->info('EbookAPI: Got patron id: '. $self->ctx->{rbdigital_patron_id}); - # Call sub to get all the vendors to be displayed on the UI $self->ctx->{vendors} = _get_authorized_vendors($self->editor->authtoken, $session_id); $self->ctx->{wishlist} = _get_patron_wishlist($self->editor->authtoken, $session_id); } else { $self->ctx->{rbdigital_patron_id} = 0; - $self->ctx->{vendors} = []; + $self->ctx->{vendors} = _get_default_vendor(); } } diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm index ad0fb65356..91c3015175 100755 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm @@ -364,6 +364,22 @@ sub _get_authorized_vendors { return $vendors_req->recv->content; } +#Get only default vendor from database +sub _get_default_vendor { + my $vendor_key = 'default'; + my $pcrud = OpenSRF::AppSession->create('open-ils.pcrud'); + $pcrud->connect(); + + my $digital_services_req = $pcrud->request('open-ils.pcrud.search.ebook_rds.atomic', "ANONYMOUS", + { + vendor_key => $vendor_key, + is_enabled => 't' + } + )->recv(); + + return $digital_services_req->{content}; +} + sub _get_patron_id { my ($authtoken, $session_id) = @_; diff --git a/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/item_parser.tt2 b/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/item_parser.tt2 index be741bc511..690e096041 100755 --- a/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/item_parser.tt2 +++ b/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/item_parser.tt2 @@ -33,7 +33,7 @@ # Loop over AUTHORS array FOREACH item IN ebook_record_item.authors; IF item.text != ''; - author_search_url = mkurl(ctx.opac_root _ vendor_search_uri, {qtype => 'author', query => item.text}); + author_search_url = ctx.opac_root _ vendor_search_uri _ '?' _ 'qtype=author&query=' _ item.text; ebook_item.authors_detail = ebook_item.authors_detail _ '' _ item.text _ ''; IF !loop.last(); ebook_item.genres = ebook_item.genres _ ", "; @@ -69,7 +69,7 @@ END; # Get Series information - series_search_url = mkurl(ctx.opac_root _ vendor_search_uri, {qtype => 'series', query => ebook_record_item.series.token}); + series_search_url = ctx.opac_root _ vendor_search_uri _ '?' _ 'qtype=series&query=' _ ebook_record_item.series.token; IF ebook_record_item.series.text; ebook_item.series = ebook_item.series _ '' _ ebook_record_item.series.text _ ''; END; diff --git a/Open-ILS/src/templates/opac/myopac/ebook_checkout.tt2 b/Open-ILS/src/templates/opac/myopac/ebook_checkout.tt2 old mode 100644 new mode 100755 diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2 index 93719dcb14..c84819249d 100755 --- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 +++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2 @@ -5,7 +5,7 @@ {url => "messages", name => l("Messages")}, {url => "circs", name => l("Items Checked Out")}, {url => "holds", name => l("Holds")}, - {url => "wishlist", name => l("Wishlist")}, + {url => "wishlist", name => l("E-Wishlist")}, {url => "prefs", name => l("Account Preferences")}, {url => "lists", name => l("My Lists")} ]; diff --git a/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 b/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 index 4df5006a80..1dd7e3be8d 100755 --- a/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 +++ b/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 @@ -24,6 +24,15 @@ [% INCLUDE 'opac/ebook_api/rbdigital/register_modal.tt2'; %] [% END; %] +[% ELSIF ctx.vendors.size > 0; %] + + [% vendor_name = ctx.vendors.0.name; %] + [% ELSE; %]
-- 2.11.0