projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/jgoodman/Freeside
[freeside.git]
/
rt
/
lib
/
RT
/
Users.pm
diff --git
a/rt/lib/RT/Users.pm
b/rt/lib/RT/Users.pm
index
f3b1b5c
..
1c75f42
100755
(executable)
--- a/
rt/lib/RT/Users.pm
+++ b/
rt/lib/RT/Users.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
4
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-118,7
+118,7
@@
sub PrincipalsAlias {
=head2 LimitToEnabled
=head2 LimitToEnabled
-Only find items that haven
\
't been disabled
+Only find items that haven't been disabled
=cut
=cut
@@
-188,6
+188,9
@@
sub MemberOfGroup {
FIELD1 => 'id',
ALIAS2 => $groupalias,
FIELD2 => 'MemberId' );
FIELD1 => 'id',
ALIAS2 => $groupalias,
FIELD2 => 'MemberId' );
+ $self->Limit( ALIAS => $groupalias,
+ FIELD => 'Disabled',
+ VALUE => 0 );
$self->Limit( ALIAS => "$groupalias",
FIELD => 'GroupId',
$self->Limit( ALIAS => "$groupalias",
FIELD => 'GroupId',
@@
-266,6
+269,11
@@
sub _JoinGroupMembers
ALIAS2 => $principals,
FIELD2 => 'id'
);
ALIAS2 => $principals,
FIELD2 => 'id'
);
+ $self->Limit(
+ ALIAS => $group_members,
+ FIELD => 'Disabled',
+ VALUE => 0,
+ ) if $args{'IncludeSubgroupMembers'};
return $group_members;
}
return $group_members;
}