projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comment change
[freeside.git]
/
rt
/
lib
/
RT
/
Link_Overlay.pm
diff --git
a/rt/lib/RT/Link_Overlay.pm
b/rt/lib/RT/Link_Overlay.pm
index
ef0347a
..
e8d6c7c
100644
(file)
--- a/
rt/lib/RT/Link_Overlay.pm
+++ b/
rt/lib/RT/Link_Overlay.pm
@@
-1,8
+1,8
@@
-#
{{{ BEGIN BPS TAGGED BLOCK
+#
BEGIN BPS TAGGED BLOCK {{{
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-200
4
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-200
7
Best Practical Solutions, LLC
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-22,7
+22,9
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# 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.
#
#
# CONTRIBUTION SUBMISSION POLICY:
#
#
# CONTRIBUTION SUBMISSION POLICY:
@@
-42,7
+44,7
@@
# works based on those contributions, and sublicense and distribute
# those contributions and any derivatives thereof.
#
# works based on those contributions, and sublicense and distribute
# those contributions and any derivatives thereof.
#
-#
}}} END BPS TAGGED BLOCK
+#
END BPS TAGGED BLOCK }}}
=head1 NAME
RT::Link - an RT Link object
=head1 NAME
RT::Link - an RT Link object
@@
-76,6
+78,9
@@
ok (UNIVERSAL::isa($link, 'DBIx::SearchBuilder::Record'));
=cut
=cut
+
+package RT::Link;
+
use strict;
no warnings qw(redefine);
use strict;
no warnings qw(redefine);
@@
-103,23
+108,31
@@
sub Create {
my $base = RT::URI->new( $self->CurrentUser );
$base->FromURI( $args{'Base'} );
my $base = RT::URI->new( $self->CurrentUser );
$base->FromURI( $args{'Base'} );
- unless ( $base->Resolver
and
$base->Scheme ) {
- $RT::Logger->warning( "$self couldn't resolve base:'"
- . $args{'Base'} . " - "
-
. "' into a URI
\n" );
+ unless ( $base->Resolver
&&
$base->Scheme ) {
+ my $msg = $self->loc("Couldn't resolve base '[_1]' into a URI.",
+ $args{'Base'});
+
$RT::Logger->warning( "$self $msg
\n" );
- return (undef);
+ if (wantarray) {
+ return(undef, $msg);
+ } else {
+ return (undef);
+ }
}
my $target = RT::URI->new( $self->CurrentUser );
$target->FromURI( $args{'Target'} );
unless ( $target->Resolver ) {
}
my $target = RT::URI->new( $self->CurrentUser );
$target->FromURI( $args{'Target'} );
unless ( $target->Resolver ) {
- $RT::Logger->warning( "$self couldn't resolve target:'"
- . $args{'Target'} . " - "
- . "' into a URI\n" );
-
- return (undef);
+ my $msg = $self->loc("Couldn't resolve target '[_1]' into a URI.",
+ $args{'Target'});
+ $RT::Logger->warning( "$self $msg\n" );
+
+ if (wantarray) {
+ return(undef, $msg);
+ } else {
+ return (undef);
+ }
}
my $base_id = 0;
}
my $base_id = 0;
@@
-256,8
+269,8
@@
sub TargetURI {
=cut
sub TargetObj {
=cut
sub TargetObj {
- my $self = shift;
- return $self->TargetURI->Object;
+
my $self = shift;
+
return $self->TargetURI->Object;
}
# }}}
}
# }}}
@@
-303,7
+316,7
@@
Returns true if the base of this link is a local ticket
sub BaseIsLocal {
my $self = shift;
sub BaseIsLocal {
my $self = shift;
- $RT::Logger->crit("Link::BaseIsLocal is deprecated in favor of Link->BaseURI->IsLocal");
+ $RT::Logger->crit("Link::BaseIsLocal is deprecated in favor of Link->BaseURI->IsLocal
at (". join(":",caller).")
");
return $self->BaseURI->IsLocal;
}
return $self->BaseURI->IsLocal;
}
@@
-319,7
+332,7
@@
Returns true if the target of this link is a local ticket
sub TargetIsLocal {
my $self = shift;
sub TargetIsLocal {
my $self = shift;
- $RT::Logger->crit("Link::BaseIsLocal is deprecated in favor of Link->BaseURI->IsLocal");
+ $RT::Logger->crit("Link::BaseIsLocal is deprecated in favor of Link->BaseURI->IsLocal
at (". join(":",caller).")
");
return $self->TargetURI->IsLocal;
}
return $self->TargetURI->IsLocal;
}
@@
-336,8
+349,8
@@
Returns an HTTP url to access the base of this link
sub BaseAsHREF {
my $self = shift;
sub BaseAsHREF {
my $self = shift;
- $RT::Logger->crit("Link::BaseAsHREF deprecated in favor of ->BaseURI->AsHREF");
- return $self->BaseURI->HREF;
+ $RT::Logger->crit("Link::BaseAsHREF deprecated in favor of ->BaseURI->AsHREF
at (". join(":",caller).")
");
+ return $self->BaseURI->
As
HREF;
}
# }}}
}
# }}}
@@
-351,8
+364,8
@@
return an HTTP url to access the target of this link
sub TargetAsHREF {
my $self = shift;
sub TargetAsHREF {
my $self = shift;
- $RT::Logger->crit("Link::TargetAsHREF deprecated in favor of ->TargetURI->AsHREF");
- return $self->TargetURI->HREF;
+ $RT::Logger->crit("Link::TargetAsHREF deprecated in favor of ->TargetURI->AsHREF
at (". join(":",caller).")
");
+ return $self->TargetURI->
As
HREF;
}
# }}}
}
# }}}