diff options
Diffstat (limited to 'rt/lib/RT/Groups_Overlay.pm')
| -rw-r--r-- | rt/lib/RT/Groups_Overlay.pm | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/rt/lib/RT/Groups_Overlay.pm b/rt/lib/RT/Groups_Overlay.pm index 793a85d18..407b905b9 100644 --- a/rt/lib/RT/Groups_Overlay.pm +++ b/rt/lib/RT/Groups_Overlay.pm @@ -88,7 +88,6 @@ sub _Init { my $self = shift; $self->{'table'} = "Groups"; $self->{'primary_key'} = "id"; - $self->{'with_disabled_column'} = 1; my @result = $self->SUPER::_Init(@_); @@ -130,7 +129,7 @@ sub PrincipalsAlias { } -# {{{ LimitToSystemInternalGroups +# {{{ LimiToSystemInternalGroups =head2 LimitToSystemInternalGroups @@ -149,7 +148,7 @@ sub LimitToSystemInternalGroups { # }}} -# {{{ LimitToUserDefinedGroups +# {{{ LimiToUserDefinedGroups =head2 LimitToUserDefinedGroups @@ -168,7 +167,7 @@ sub LimitToUserDefinedGroups { # }}} -# {{{ LimitToPersonalGroupsFor +# {{{ LimiToPersonalGroupsFor =head2 LimitToPersonalGroupsFor PRINCIPAL_ID @@ -323,6 +322,7 @@ sub WithRight { $from_group->WithGroupRight( %args ); #XXX: DIRTY HACK + use DBIx::SearchBuilder 1.50; #no version on ::Union :( use DBIx::SearchBuilder::Union; my $union = new DBIx::SearchBuilder::Union; $union->add($from_role); @@ -377,13 +377,12 @@ Only find items that haven\'t been disabled sub LimitToEnabled { my $self = shift; - - $self->{'handled_disabled_column'} = 1; - $self->Limit( - ALIAS => $self->PrincipalsAlias, - FIELD => 'Disabled', - VALUE => '0', - ); + + $self->Limit( ALIAS => $self->PrincipalsAlias, + FIELD => 'Disabled', + VALUE => '0', + OPERATOR => '=', + ); } # }}} @@ -398,14 +397,13 @@ Only find items that have been deleted. sub LimitToDeleted { my $self = shift; - $self->{'handled_disabled_column'} = $self->{'find_disabled_rows'} = 1; - $self->Limit( - ALIAS => $self->PrincipalsAlias, - FIELD => 'Disabled', - VALUE => 1, - ); + $self->{'find_disabled_rows'} = 1; + $self->Limit( ALIAS => $self->PrincipalsAlias, + FIELD => 'Disabled', + OPERATOR => '=', + VALUE => 1, + ); } - # }}} # {{{ sub Next |