[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 973aaee8be09a47613b5fb0f65deb44df7379ac4

[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, rel_2_1 has been updated
       via  973aaee8be09a47613b5fb0f65deb44df7379ac4 (commit)
      from  76af0b5907b3f9e26c25ebd8b6b6a391d0b31dc3 (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 973aaee8be09a47613b5fb0f65deb44df7379ac4
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 1479c1f..559dc22 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -752,9 +752,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