diff options
Diffstat (limited to 'rt/lib/RT/CachedGroupMembers.pm')
| -rw-r--r-- | rt/lib/RT/CachedGroupMembers.pm | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/rt/lib/RT/CachedGroupMembers.pm b/rt/lib/RT/CachedGroupMembers.pm index f65796acb..e6bda973c 100644 --- a/rt/lib/RT/CachedGroupMembers.pm +++ b/rt/lib/RT/CachedGroupMembers.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -69,11 +69,10 @@ package RT::CachedGroupMembers; use strict; use warnings; +use base 'RT::SearchBuilder'; use RT::CachedGroupMember; -use base 'RT::SearchBuilder'; - sub Table { 'CachedGroupMembers'} # {{{ LimitToUsers @@ -89,9 +88,10 @@ groups from users for display purposes sub LimitToUsers { my $self = shift; - my $principals = $self->NewAlias('Principals'); - $self->Join( ALIAS1 => 'main', FIELD1 => 'MemberId', - ALIAS2 => $principals, FIELD2 =>'id'); + my $principals = $self->Join( + ALIAS1 => 'main', FIELD1 => 'MemberId', + TABLE2 => 'Principals', FIELD2 =>'id' + ); $self->Limit( ALIAS => $principals, FIELD => 'PrincipalType', @@ -114,9 +114,11 @@ groups from users for display purposes sub LimitToGroups { my $self = shift; - my $principals = $self->NewAlias('Principals'); - $self->Join( ALIAS1 => 'main', FIELD1 => 'MemberId', - ALIAS2 => $principals, FIELD2 =>'id'); + my $principals = $self->Join( + ALIAS1 => 'main', FIELD1 => 'MemberId', + TABLE2 => 'Principals', FIELD2 =>'id' + ); + $self->Limit( ALIAS => $principals, FIELD => 'PrincipalType', @@ -166,23 +168,13 @@ sub LimitToGroupsWithMember { VALUE => $member || '0', FIELD => 'MemberId', ENTRYAGGREGATOR => 'OR', - QUOTEVALUE => 0 + QUOTEVALUE => 0 )); } # }}} -=head2 NewItem - -Returns an empty new RT::CachedGroupMember item - -=cut - -sub NewItem { - my $self = shift; - return(RT::CachedGroupMember->new($self->CurrentUser)); -} RT::Base->_ImportOverlays(); 1; |