freeside/FS/FS/TicketSystem RT_External.pm,1.13,1.14 RT_Internal.pm,1.6,1.7

[Ivan Kohler]

Update of /home/cvs/cvsroot/freeside/FS/FS/TicketSystem
In directory pouncequick:/tmp/cvs-serv3437

Modified Files:
	RT_External.pm RT_Internal.pm 
Log Message:
fix up RT_Internal again, hopefully this is the last of the breakage from RT_Internal

Index: RT_Internal.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/TicketSystem/RT_Internal.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- RT_Internal.pm	29 Mar 2005 01:40:52 -0000	1.6
+++ RT_Internal.pm	1 Jun 2005 20:31:56 -0000	1.7
@@ -26,28 +26,13 @@
   $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 {
-
-  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;

Index: RT_External.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/TicketSystem/RT_External.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- RT_External.pm	29 Mar 2005 01:40:52 -0000	1.13
+++ RT_External.pm	1 Jun 2005 20:31:56 -0000	1.14
@@ -179,10 +179,8 @@
 }
 
 sub href_customer_tickets {
-
   my $self = shift;
-  return $external_url . $self->_href_customer_tickets(@_);
-
+  $self->baseurl(). $self->_href_customer_tickets(@_);
 }
 
 
@@ -197,10 +195,8 @@
 }
 
 sub href_new_ticket {
-
   my $self = shift;
-  return return $external_url . $self->_href_new_ticket(@_);
-
+  baseurl(). $self->_href_new_ticket(@_);
 }
 
 sub _href_ticket {
@@ -209,16 +205,13 @@
 }
 
 sub href_ticket {
-
   my $self = shift;
-  return $external_url . $self->_href_ticket(@_);
-
+  baseurl(). $self->_href_ticket(@_);
 }
 
 sub baseurl {
-
-  return $external_url;
-
+  #my $self = shift;
+  $external_url;
 }
 
 1;