fixup RT integration grr!

diff --git a/README.1.5.7 b/README.1.5.7
index 85722b7..a491130 100644 (file)
--- a/README.1.5.7
+++ b/README.1.5.7
@@ -138,6 +138,13 @@ Installs w/integrated RT:
   CREATE INDEX Attributes1 on Attributes(Name);
   CREATE INDEX Attributes2 on Attributes(ObjectType, ObjectId);
 
+  Add these lines to /opt/rt3/etc/RT_SiteConfig.pm (before the "1;"):
+    $RT::URI::freeside::IntegrationType = 'Internal';
+    $RT::URI::freeside::URL = 'http://path/to/your/freeside/';
+    Set($DatabaseHost   , '');
+
+(End of Installs w/integrated RT)
+
 
 (make sure you have upgrade DBIx::DBSchema to 0.24)
 dbdef-create username 

diff --git a/rt/lib/RT/URI/freeside.pm b/rt/lib/RT/URI/freeside.pm
index 687f923..ff1d38d 100644 (file)
--- a/rt/lib/RT/URI/freeside.pm
+++ b/rt/lib/RT/URI/freeside.pm
@@ -163,7 +163,7 @@ sub _FreesideURILabel {
 
 }
 
-=item _FreesideURILabel
+=item _FreesideURILabelLong
 
 Method that returns a longer string describing the customer referenced
 in the URI.

diff --git a/rt/lib/RT/URI/freeside/Internal.pm b/rt/lib/RT/URI/freeside/Internal.pm
index 1830779..4f5a73e 100644 (file)
--- a/rt/lib/RT/URI/freeside/Internal.pm
+++ b/rt/lib/RT/URI/freeside/Internal.pm
@@ -32,7 +32,7 @@ use vars qw($conf);
 
 use FS;
 use FS::UID qw(dbh);
-use FS::CGI qw(popurl);
+use FS::CGI qw(popurl small_custview);
 use FS::Conf;
 use FS::Record qw(qsearchs qsearch dbdef);
 use FS::cust_main;
@@ -82,7 +82,7 @@ sub _FreesideGetRecord {
     return;
   }
 
-  return { $fsrec->hash };
+  return { $fsrec->hash, '_object' => $fsrec };
 
 }
 
@@ -96,7 +96,7 @@ sub FreesideGetConfig {
 
   $conf = new FS::Conf unless ref($conf);
 
-  return $conf->config(@_);
+  return scalar($conf->config(@_));
 
 }
 
@@ -112,4 +112,26 @@ sub small_custview {
 
 }
 
+sub _FreesideURILabelLong {
+
+  my $self = shift;
+
+  my $table = $self->{'fstable'};
+
+  if ( $table eq 'cust_main' ) {
+
+    my $rec = $self->_FreesideGetRecord();
+    return small_custview( $rec->{'_object'},
+                           scalar(FS::Conf->new->config('countrydefault')),
+                           1 #nobalance
+                         );
+
+  } else {
+
+    return $self->_FreesideURILabel();
+
+  }
+
+}
+
 1;