From 291bce0dee74ae7f2dd70abe1af73a27c2b0d438 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 18 Feb 2014 14:38:07 -0500 Subject: [PATCH] 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 Signed-off-by: Remington Steed Signed-off-by: Dan Wells --- .../lib/OpenILS/Application/Actor/UserGroups.pm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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 2f9914d51d..0a94956090 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; -- 2.43.2