From 10f285c61de45ca3d027c8d4ee4e519fd43c853d Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Date: Tue, 25 Sep 2018 17:21:18 -0400 Subject: [PATCH] LP#1772680: Changed Registrationn Form output and various other changes Signed-off-by: Jaswinder Singh Signed-off-by: Galen Charlton --- .../lib/OpenILS/Application/EbookAPI/RBDigital.pm | 10 +++++----- Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm | 9 +++++++++ .../opac/ebook_api/rbdigital/parts/result/table.tt2 | 1 - .../opac/ebook_api/rbdigital/register_modal.tt2 | 19 ++++++++++--------- Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 | 5 ++++- Open-ILS/web/css/skin/default/ebook/rbdigital.css | 11 ++++++++++- 6 files changed, 38 insertions(+), 17 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 ed33d8e846..af3106a915 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm @@ -112,12 +112,12 @@ sub do_client_auth { sub _get_vendor_library { my $home_ou = @_; my $object_rdsa; - my $ebook_rds_req; + my $ebook_rdsa_req; my $pcrud = OpenSRF::AppSession->create('open-ils.pcrud'); $pcrud->connect(); - $ebook_rds_req = $pcrud->request('open-ils.pcrud.search.ebook_rdsa.atomic', "ANONYMOUS", + $ebook_rdsa_req = $pcrud->request('open-ils.pcrud.search.ebook_rdsa.atomic', "ANONYMOUS", { home_ou => $home_ou, "+ebook_rds" => { @@ -133,9 +133,9 @@ sub _get_vendor_library { } )->gather(1); - if ($ebook_rds_req && scalar (@$ebook_rds_req) > 0) { - #read the library.id to find corrosponding library id from digital services atuhorized table - $object_rdsa = $ebook_rds_req->[0]; + if ($ebook_rdsa_req && scalar (@$ebook_rdsa_req) > 0) { + #read the library.id to find corresponding library id from digital services authorized table + $object_rdsa = $ebook_rdsa_req->[0]; } return $object_rdsa; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm index 601ae46cf5..bd44b66b92 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm @@ -416,6 +416,15 @@ sub load_rbdigital_common { $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); + + # Loop through vendors array and get the RBdigital library URL tied to logged in User + foreach my $value (@ {$self->ctx->{vendors}}) { + if ($value->vendor_key eq 'rbdigital') { + $self->ctx->{vendor_library_url} = $value->[0]->digital_services_library_url; + last; + } + } + $self->ctx->{wishlist} = _get_patron_wishlist($self->editor->authtoken, $session_id); } else { $self->ctx->{rbdigital_patron_id} = 0; diff --git a/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/result/table.tt2 b/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/result/table.tt2 index 1390ed919f..c0e4c536e9 100644 --- a/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/result/table.tt2 +++ b/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/result/table.tt2 @@ -7,7 +7,6 @@ IF ctx.result_stop > ctx.hit_count; ctx.result_stop = ctx.hit_count; END; result_count = ctx.result_start; - USE Dumper; %] [% PROCESS "opac/parts/result/paginate.tt2" %] [% ctx.results_count_header = PROCESS results_count_header; diff --git a/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 b/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 index bc7f076afb..1005beaba5 100644 --- a/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 +++ b/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 @@ -27,9 +27,9 @@
- - + +
@@ -42,24 +42,25 @@ [% l( -