diff options
author | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:18:55 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:27:04 -0700 |
commit | e131b1f71f08b69abb832c1687d1f29682d171f8 (patch) | |
tree | 490167e41d9fe05b760e7b21a96ee35a86f8edda /rt/lib/RT/Links.pm | |
parent | d05d7346bb2387fd9d0354923d577275c5c7f019 (diff) |
RT 4.2.11, ticket#13852
Diffstat (limited to 'rt/lib/RT/Links.pm')
-rw-r--r-- | rt/lib/RT/Links.pm | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/rt/lib/RT/Links.pm b/rt/lib/RT/Links.pm index b9aba12e1..89e261b09 100644 --- a/rt/lib/RT/Links.pm +++ b/rt/lib/RT/Links.pm @@ -70,11 +70,10 @@ package RT::Links; use strict; use warnings; +use base 'RT::SearchBuilder'; use RT::Link; -use base 'RT::SearchBuilder'; - sub Table { 'Links'} @@ -83,27 +82,27 @@ use RT::URI; sub Limit { my $self = shift; my %args = ( ENTRYAGGREGATOR => 'AND', - OPERATOR => '=', - @_); + OPERATOR => '=', + @_); # If we're limiting by target, order by base # (Order by the thing that's changing) - if ( ($args{'FIELD'} eq 'Target') or - ($args{'FIELD'} eq 'LocalTarget') ) { - $self->OrderByCols( + if ( ($args{'FIELD'} eq 'Target') or + ($args{'FIELD'} eq 'LocalTarget') ) { + $self->OrderByCols( { ALIAS => 'main', FIELD => 'LocalBase', ORDER => 'ASC' }, { ALIAS => 'main', FIELD => 'Base', ORDER => 'ASC' }, ); } - elsif ( ($args{'FIELD'} eq 'Base') or - ($args{'FIELD'} eq 'LocalBase') ) { - $self->OrderByCols( + elsif ( ($args{'FIELD'} eq 'Base') or + ($args{'FIELD'} eq 'LocalBase') ) { + $self->OrderByCols( { ALIAS => 'main', FIELD => 'LocalTarget', ORDER => 'ASC' }, { ALIAS => 'main', FIELD => 'Target', ORDER => 'ASC' }, ); } - + $self->SUPER::Limit(%args); } @@ -140,24 +139,12 @@ sub LimitReferredToBy { # }}} -=head2 NewItem - -Returns an empty new RT::Link item - -=cut - -sub NewItem { - my $self = shift; - return(RT::Link->new($self->CurrentUser)); -} - sub AddRecord { my $self = shift; my $record = shift; return unless $self->IsValidLink($record); push @{$self->{'items'}}, $record; - $self->{'rows'}++; } =head2 IsValidLink |