badly placed small_custview all of a sudden causing fatal errors?! wtf

[freeside.git] / rt / lib / RT / URI / freeside / Internal.pm

diff --git a/rt/lib/RT/URI/freeside/Internal.pm b/rt/lib/RT/URI/freeside/Internal.pm
index 1830779..bd7c42c 100644 (file)
--- a/rt/lib/RT/URI/freeside/Internal.pm
+++ b/rt/lib/RT/URI/freeside/Internal.pm
@@ -28,11 +28,12 @@
 use strict;
 no warnings qw(redefine);
 
-use vars qw($conf);
+#use vars qw($conf);
 
 use FS;
 use FS::UID qw(dbh);
 use FS::CGI qw(popurl);
+use FS::UI::Web::small_custview qw(small_custview);
 use FS::Conf;
 use FS::Record qw(qsearchs qsearch dbdef);
 use FS::cust_main;
@@ -82,7 +83,7 @@ sub _FreesideGetRecord {
     return;
   }
 
-  return { $fsrec->hash };
+  return { $fsrec->hash, '_object' => $fsrec };
 
 }
 
@@ -94,9 +95,10 @@ sub FreesideVersion {
 
 sub FreesideGetConfig {
 
-  $conf = new FS::Conf unless ref($conf);
+  #$conf = new FS::Conf unless ref($conf);
+  my $conf = new FS::Conf;
 
-  return $conf->config(@_);
+  return scalar($conf->config(@_));
 
 }
 
@@ -106,9 +108,37 @@ sub smart_search { #Subroutine
 
 }
 
+sub email_search { #Subroutine
+
+  return map { { $_->hash } } &FS::cust_main::email_search(@_);
+
+}
+
 sub small_custview {
 
-  return &FS::CGI::small_custview(@_);
+  return &FS::UI::Web::small_custview::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();
+
+  }
 
 }