X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FAdmin%2FElements%2FSelectNewGroupMembers;fp=rt%2Fshare%2Fhtml%2FAdmin%2FElements%2FSelectNewGroupMembers;h=8778daec04cb0033a2678ee89878e2afbee4a925;hb=33beebf4cb42eba3e1dd868ad5e0af102de961da;hp=04e99e5781c78dac253a05122b7bcd668e6afc72;hpb=7ac86daf67b0a95153b736d5811f9050363f6553;p=freeside.git diff --git a/rt/share/html/Admin/Elements/SelectNewGroupMembers b/rt/share/html/Admin/Elements/SelectNewGroupMembers index 04e99e578..8778daec0 100755 --- a/rt/share/html/Admin/Elements/SelectNewGroupMembers +++ b/rt/share/html/Admin/Elements/SelectNewGroupMembers @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -46,58 +46,41 @@ %# %# END BPS TAGGED BLOCK }}} % if ( $Show ne 'Groups' ) { -<&|/l&>Users -
- -
+ +
+ % } % if ( $Show ne 'Users' ) { -<&|/l&>Groups -
- + +
+ % } - <%INIT> -my $users = new RT::Users($session{'CurrentUser'}); - -$users->Limit( - FIELD => 'id', - VALUE => $RT::SystemUser->id, - OPERATOR => '!=', - ENTRYAGGREGATOR => 'AND' -); -$users->Limit( - FIELD => 'id', - VALUE => $RT::Nobody->id, - OPERATOR => '!=', - ENTRYAGGREGATOR => 'AND' -); -$users->LimitToPrivileged(); - -my $groups = new RT::Groups($session{'CurrentUser'}); - -# self-recursive group membership considered harmful! -$groups->Limit(FIELD => 'id', VALUE => $Group->id, OPERATOR => '!=' ); -$groups->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined'); - - +my $user_ids = join(',', grep { $SkipUsers->{$_} } keys %$SkipUsers); +my $group_ids = join(',', grep { $SkipGroups->{$_} } keys %$SkipGroups); <%ARGS> $Name => 'Users'