From 170366651e5d695cd16b5176ed16e87841bad3a1 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Date: Thu, 28 Jun 2018 15:35:27 -0400 Subject: [PATCH] LP#1772680: Resolved multiple issues Signed-off-by: Jaswinder Singh Signed-off-by: Galen Charlton --- .../lib/OpenILS/Application/EbookAPI/RBDigital.pm | 1 + .../lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm | 8 +-- .../opac/ebook_api/rbdigital/parts/item_parser.tt2 | 5 +- .../ebook_api/rbdigital/parts/record/summary.tt2 | 9 ++-- .../ebook_api/rbdigital/parts/result/table.tt2 | 62 ++++++++++++++-------- .../web/js/ui/default/opac/ebook_api/rbdigital.js | 2 +- 6 files changed, 49 insertions(+), 38 deletions(-) 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 21f4c5f392..8bee8ae8dc 100755 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm @@ -184,6 +184,7 @@ sub do_patron_auth { $logger->error("EbookAPI: Unable to get RBDigital Patron ID found for $username/$email"); } + return $patron_id; } 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 c432060051..4a5abdd614 100755 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm @@ -145,12 +145,6 @@ sub load_rbdigital_results { # filters my $filters = []; - # my $query; - # foreach (grep /^fi:/, $cgi->param) { - # /:(-?\w+)$/ or next; - # my $term = join(",", $cgi->param($_)); - # $query .= " $1($term)" if length $term; - # } # Build array with Search Inputs # Title (if any) @@ -245,6 +239,8 @@ sub load_rbdigital_results { # Return hash reference of wishlist {isbn => true} $ctx->{wishlist} = _get_patron_wishlist($self->editor->authtoken, $session_id); + $ctx->{holds} = _get_patron_holds($self->editor->authtoken, $session_id); + $ctx->{checkouts} = _get_patron_checkouts($self->editor->authtoken, $session_id); # Add values to returned query structure for GUI to process 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 b49775310e..be741bc511 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 @@ -28,10 +28,7 @@ ebook_item.authors_detail = ''; # Check title is available for Checkout Service - ebook_item.isTitleAvailable = false; - IF item.interest.isAvailable == 'true'; - ebook_item.isTitleAvailable = true; - END; + ebook_item.isAvailable = ebook_record_item.interest.isAvailable; # Loop over AUTHORS array FOREACH item IN ebook_record_item.authors; diff --git a/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/record/summary.tt2 index 6ae94046b3..64c94f1ca5 100755 --- a/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/record/summary.tt2 +++ b/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/record/summary.tt2 @@ -6,12 +6,14 @@ #Set the ebook_record_item before processing the item_parser ebook_record_item = ctx.title_info.item; + ebook_record_item.interest = ctx.title_info.interest; ebook_record_item.summary = ctx.title_summary.summary; ebook_record_item.recommended_books = ctx.recommended_books; ebook_isbn = ebook_record_item.isbn; PROCESS "opac/ebook_api/rbdigital/parts/item_parser.tt2"; %] + @@ -44,7 +46,7 @@ [% END %]