X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Flib%2FRT%2FLinks.pm;h=d2ecca25626219c47acf8d1136593a936d004ad4;hp=ccc72d7492f7c4b7bbf9c92ddf248b8568ad8f4a;hb=de9d037528895f7151a9aead6724ce2df95f9586;hpb=c24d6e2242ae0e026684b8f95decf156aba6e75e diff --git a/rt/lib/RT/Links.pm b/rt/lib/RT/Links.pm index ccc72d749..d2ecca256 100644 --- a/rt/lib/RT/Links.pm +++ b/rt/lib/RT/Links.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC # # # (Except where explicitly superseded by other copyright notices) @@ -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