X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FLinks_Overlay.pm;h=d1f70092a14753f6b2a65f115facbec5951cc571;hb=3db061f538c06804bd0a52b9ef8be3dc6b6db82e;hp=bf95e632616049a27928576d095657bbcc9af095;hpb=c648976f0b7975f2328ebd7ba8c711fad0ca4195;p=freeside.git diff --git a/rt/lib/RT/Links_Overlay.pm b/rt/lib/RT/Links_Overlay.pm index bf95e6326..d1f70092a 100644 --- a/rt/lib/RT/Links_Overlay.pm +++ b/rt/lib/RT/Links_Overlay.pm @@ -1,40 +1,40 @@ # BEGIN BPS TAGGED BLOCK {{{ -# +# # COPYRIGHT: -# -# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC -# -# +# +# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +# +# # (Except where explicitly superseded by other copyright notices) -# -# +# +# # LICENSE: -# +# # This work is made available to you under the terms of Version 2 of # the GNU General Public License. A copy of that license should have # been provided with this software, but in any event can be snarfed # from www.gnu.org. -# +# # This work is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 or visit their web page on the internet at -# http://www.gnu.org/copyleft/gpl.html. -# -# +# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. +# +# # CONTRIBUTION SUBMISSION POLICY: -# +# # (The following paragraph is not intended to limit the rights granted # to you to modify and distribute this software under the terms of # the GNU General Public License and is only of importance to you if # you choose to contribute your changes and enhancements to the # community by submitting them to Best Practical Solutions, LLC.) -# +# # By intentionally submitting any modifications, corrections or # derivatives to this work, or any other work intended for use with # Request Tracker, to Best Practical Solutions, LLC, you confirm that @@ -43,8 +43,9 @@ # royalty-free, perpetual, license to use, copy, create derivative # works based on those contributions, and sublicense and distribute # those contributions and any derivatives thereof. -# +# # END BPS TAGGED BLOCK }}} + =head1 NAME RT::Links - A collection of Link objects @@ -60,11 +61,6 @@ =head1 METHODS -=begin testing - -ok (require RT::Links); - -=end testing =cut @@ -82,16 +78,6 @@ sub Limit { OPERATOR => '=', @_); - #if someone's trying to search for tickets, try to resolve the uris for searching. - - if ( ( $args{'OPERATOR'} eq '=') and - ( $args{'FIELD'} eq 'Base') or ($args{'FIELD'} eq 'Target') - ) { - my $dummy = RT::URI->new($self->CurrentUser); - $dummy->FromURI($args{'VALUE'}); - # $uri = $dummy->URI; - } - # If we're limiting by target, order by base # (Order by the thing that's changing) @@ -157,6 +143,10 @@ sub Next { my $Link = $self->SUPER::Next(); return $Link unless $Link && ref $Link; + # skip very invalid Link records + unless ($Link->Target && $Link->Base) { + return $self->Next; + } # Skip links to local objects thast are deleted if ( $Link->TargetURI->IsLocal and UNIVERSAL::isa($Link->TargetObj,"RT::Ticket") and $Link->TargetObj->__Value('status') eq "deleted") {