diff options
Diffstat (limited to 'rt/lib/RT/Groups_Overlay.pm')
| -rw-r--r-- | rt/lib/RT/Groups_Overlay.pm | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/rt/lib/RT/Groups_Overlay.pm b/rt/lib/RT/Groups_Overlay.pm index 8d09755da..1b3ef51e2 100644 --- a/rt/lib/RT/Groups_Overlay.pm +++ b/rt/lib/RT/Groups_Overlay.pm @@ -88,6 +88,7 @@ sub _Init { my $self = shift; $self->{'table'} = "Groups"; $self->{'primary_key'} = "id"; + $self->{'with_disabled_column'} = 1; my @result = $self->SUPER::_Init(@_); @@ -129,7 +130,7 @@ sub PrincipalsAlias { } -# {{{ LimiToSystemInternalGroups +# {{{ LimitToSystemInternalGroups =head2 LimitToSystemInternalGroups @@ -148,7 +149,7 @@ sub LimitToSystemInternalGroups { # }}} -# {{{ LimiToUserDefinedGroups +# {{{ LimitToUserDefinedGroups =head2 LimitToUserDefinedGroups @@ -167,7 +168,7 @@ sub LimitToUserDefinedGroups { # }}} -# {{{ LimiToPersonalGroupsFor +# {{{ LimitToPersonalGroupsFor =head2 LimitToPersonalGroupsFor PRINCIPAL_ID @@ -322,6 +323,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); @@ -376,12 +378,13 @@ Only find items that haven\'t been disabled sub LimitToEnabled { my $self = shift; - - $self->Limit( ALIAS => $self->PrincipalsAlias, - FIELD => 'Disabled', - VALUE => '0', - OPERATOR => '=', - ); + + $self->{'handled_disabled_column'} = 1; + $self->Limit( + ALIAS => $self->PrincipalsAlias, + FIELD => 'Disabled', + VALUE => '0', + ); } # }}} @@ -396,13 +399,14 @@ Only find items that have been deleted. sub LimitToDeleted { my $self = shift; - $self->{'find_disabled_rows'} = 1; - $self->Limit( ALIAS => $self->PrincipalsAlias, - FIELD => 'Disabled', - OPERATOR => '=', - VALUE => 1, - ); + $self->{'handled_disabled_column'} = $self->{'find_disabled_rows'} = 1; + $self->Limit( + ALIAS => $self->PrincipalsAlias, + FIELD => 'Disabled', + VALUE => 1, + ); } + # }}} # {{{ sub Next |