projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a4bc36f
)
fix up RT_Internal again, hopefully this is the last of the breakage from RT_Internal
author
ivan
<ivan>
Wed, 1 Jun 2005 20:31:56 +0000
(20:31 +0000)
committer
ivan
<ivan>
Wed, 1 Jun 2005 20:31:56 +0000
(20:31 +0000)
FS/FS/TicketSystem/RT_External.pm
patch
|
blob
|
history
FS/FS/TicketSystem/RT_Internal.pm
patch
|
blob
|
history
diff --git
a/FS/FS/TicketSystem/RT_External.pm
b/FS/FS/TicketSystem/RT_External.pm
index
187b05c
..
b401514
100644
(file)
--- a/
FS/FS/TicketSystem/RT_External.pm
+++ b/
FS/FS/TicketSystem/RT_External.pm
@@
-179,10
+179,8
@@
sub _href_customer_tickets {
}
sub href_customer_tickets {
}
sub href_customer_tickets {
-
my $self = shift;
my $self = shift;
- return $external_url . $self->_href_customer_tickets(@_);
-
+ $self->baseurl(). $self->_href_customer_tickets(@_);
}
}
@@
-197,10
+195,8
@@
sub _href_new_ticket {
}
sub href_new_ticket {
}
sub href_new_ticket {
-
my $self = shift;
my $self = shift;
- return return $external_url . $self->_href_new_ticket(@_);
-
+ baseurl(). $self->_href_new_ticket(@_);
}
sub _href_ticket {
}
sub _href_ticket {
@@
-209,16
+205,13
@@
sub _href_ticket {
}
sub href_ticket {
}
sub href_ticket {
-
my $self = shift;
my $self = shift;
- return $external_url . $self->_href_ticket(@_);
-
+ baseurl(). $self->_href_ticket(@_);
}
sub baseurl {
}
sub baseurl {
-
- return $external_url;
-
+ #my $self = shift;
+ $external_url;
}
1;
}
1;
diff --git
a/FS/FS/TicketSystem/RT_Internal.pm
b/FS/FS/TicketSystem/RT_Internal.pm
index
0043811
..
6f28faf
100644
(file)
--- a/
FS/FS/TicketSystem/RT_Internal.pm
+++ b/
FS/FS/TicketSystem/RT_Internal.pm
@@
-26,28
+26,13
@@
sub customer_tickets {
$self->SUPER::customer_tickets( $custnum, $limit, $priority, dbh );
}
$self->SUPER::customer_tickets( $custnum, $limit, $priority, dbh );
}
-sub href_customer_tickets {
- my $self = shift;
- # well, 2 is wrong here but will have to do for now
- baseurl().'rt/'. $self->_href_customer_tickets(@_);
-}
-
-sub href_new_ticket {
- my $self = shift;
- # well, 2 is wrong here but will have to do for now
- baseurl().'rt/'. $self->_href_new_ticket(@_);
-}
-
-sub href_ticket {
- my $self = shift;
- # well, 2 is wrong here but will have to do for now
- baseurl().'rt/'. $self->_href_ticket(@_);
-}
-
sub baseurl {
sub baseurl {
-
- return popurl(2);
-
+ #my $self = shift;
+ if ( $RT::URI::freeside::URL ) {
+ $RT::URI::freeside::URL. 'rt/';
+ } else {
+ 'http://you_need_to_set_RT_URI_freeside_URL_in_SiteConfig.pm/';
+ }
}
1;
}
1;