[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_4 updated. 7246a48c21c1898ebf02f5fc0874ff74776cca5e

[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_4 has been updated
       via  7246a48c21c1898ebf02f5fc0874ff74776cca5e (commit)
      from  5ad676cbd1c73603de575707a12b3f9ecb7f3d06 (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 7246a48c21c1898ebf02f5fc0874ff74776cca5e
Author: Bill Erickson <berick at esilibrary.com>
Date:   Tue Feb 18 14:38:07 2014 -0500

    LP#1281750 Ignore deleted users in usrgroup info APIs
    
    Ignore deleted users in these API calls:
    
    open-ils.actor.usergroup.members.balance_owed
    open-ils.actor.usergroup.members.retrieve
    open-ils.actor.usergroup.leaders.retrieve
    open-ils.actor.address.members
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor/UserGroups.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor/UserGroups.pm
index 7691fe5..8253022 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor/UserGroups.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor/UserGroups.pm
@@ -25,7 +25,8 @@ sub group_money_summary {
 	return $e->event unless $e->checkauth;
 	return $e->event unless $e->allowed('VIEW_USER');
 
-	my $users = $e->search_actor_user({usrgroup => $group_id}, {idlist => 1});
+    my $users = $e->search_actor_user(
+        {usrgroup => $group_id, deleted => 'f'}, {idlist => 1});
     my @mous;
 
     for my $uid ( @$users ) {
@@ -56,7 +57,8 @@ sub get_users_from_usergroup {
 	my $e = new_editor(authtoken=>$auth);
 	return $e->event unless $e->checkauth;
 	return $e->event unless $e->allowed('VIEW_USER'); # XXX reley on editor perm
-	return $e->search_actor_user({usrgroup => $usergroup}, {idlist => 1});
+    return $e->search_actor_user(
+        {usrgroup => $usergroup, deleted => 'f'}, {idlist => 1});
 }
 
 
@@ -74,7 +76,8 @@ sub get_leaders_from_usergroup {
 	my $e = new_editor(authtoken=>$auth);
 	return $e->event unless $e->checkauth;
 	return $e->event unless $e->allowed('VIEW_USER'); # XXX reley on editor perm
-	my $users = $e->search_actor_user({usrgroup => $usergroup})
+    my $users = $e->search_actor_user(
+        {usrgroup => $usergroup, deleted => 'f'})
 		or return $e->event;
 
 	my @res;
@@ -105,8 +108,10 @@ sub get_address_members {
 	return $e->event unless $e->allowed('VIEW_USER'); # XXX reley on editor perm
 
 	my $ad = $e->retrieve_actor_user_address($addrid) or return $e->event;
-	my $ma = $e->search_actor_user({mailing_address => $addrid}, {idlist => 1});
-	my $ba = $e->search_actor_user({billing_address => $addrid}, {idlist => 1});
+    my $ma = $e->search_actor_user(
+        {mailing_address => $addrid, deleted => 'f'}, {idlist => 1});
+    my $ba = $e->search_actor_user(
+        {billing_address => $addrid, deleted => 'f'}, {idlist => 1});
 
 	my @list = (@$ma, @$ba, $ad->usr);
 	my %dedup = map { $_ => 1 } @list;

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

Summary of changes:
 .../lib/OpenILS/Application/Actor/UserGroups.pm    |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS