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

[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  47ab015a78b94d7e9e530747729825302fbaa016 (commit)
      from  0062008c0a346ee37a9ae8870e33c06823c67a49 (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 47ab015a78b94d7e9e530747729825302fbaa016
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Sat Jul 2 18:50:27 2011 -0400

    Fix checkout on alternate patron barcode
    
    Specifically, when a non-primary patron barcode is used.
    Such as via SIP2.
    
    NOTE: This does not change the behavior of inactive cards, nor
    will stock Evergreen usage produce a situation where this fix
    comes into play. --miker
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
index 0b36f40..2d42704 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -764,9 +764,12 @@ sub mk_env {
 		my $card = $e->search_actor_card({barcode => $self->patron_barcode})->[0] 
 			or return $self->bail_on_events(OpenILS::Event->new('ACTOR_USER_NOT_FOUND'));
 
-		$patron = $e->search_actor_user([{card => $card->id}, $flesh])->[0]
+		$patron = $e->retrieve_actor_user($card->usr)
 			or return $self->bail_on_events(OpenILS::Event->new('ACTOR_USER_NOT_FOUND'));
 
+        # Use the card we looked up, not the patron's primary, for card active checks
+        $patron->card($card);
+
     } else {
         if( my $copy = $self->copy ) {
 

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

Summary of changes:
 .../lib/OpenILS/Application/Circ/Circulate.pm      |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS