[open-ils-commits] [GIT] Evergreen ILS branch master updated. d2ff144c82e590ec7d0884d4cb5a9fa1766f5107

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  d2ff144c82e590ec7d0884d4cb5a9fa1766f5107 (commit)
      from  512dd0c5be9a460a187a524a314b2e4c15edcc0b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d2ff144c82e590ec7d0884d4cb5a9fa1766f5107
Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
Date:   Tue Feb 28 17:28:31 2017 -0800

    LP#1668816: Prevent Internal Server Error in OPAC when logged-in user has no card
    
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index f2f5d8f..6aa1f58 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -302,7 +302,8 @@ sub load_common {
             $ctx->{authtoken} = $e->authtoken;
             $ctx->{authtime} = $e->authtime;
             $ctx->{user} = $e->requestor;
-            $ctx->{active_card} = $self->editor->retrieve_actor_card($ctx->{user}->card)->barcode;
+            my $card = $self->editor->retrieve_actor_card($ctx->{user}->card);
+            $ctx->{active_card} = (ref $card) ? $card->barcode : undef;
             $ctx->{place_unfillable} = 1 if $e->requestor->wsid && $e->allowed('PLACE_UNFILLABLE_HOLD', $e->requestor->ws_ou);
 
             # The browser client does not set an OILS-Wrapper header (above).

-----------------------------------------------------------------------

Summary of changes:
 .../src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm    |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS