first part of ACL and re-skinning work and some other small stuff

[freeside.git] / httemplate / search / svc_domain.cgi

diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 8d6547c..b02eea8 100755 (executable)
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -37,7 +37,6 @@ if ( keys %svc_domain ) {
                     join(' AND ', map "$_ = ". dbh->quote($svc_domain{$_}),
                                       keys %svc_domain
                         );
-
 }
 
 my $sql_query = {
@@ -45,15 +44,16 @@ my $sql_query = {
   'hashref'   => \%svc_domain,
   'select'    => join(', ',
                    'svc_domain.*',
-                   map "cust_main.$_", qw(custnum last first company)
+                    'cust_main.custnum',
+                    FS::UI::Web::cust_sql_fields(),
                  ),
   'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  )'.
-                 'LEFT JOIN cust_pkg  USING ( pkgnum  )'.
-                 'LEFT JOIN cust_main USING ( custnum )',
+  'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                 'LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                 'LEFT JOIN cust_main USING ( custnum ) ',
 };
 
-my $link = [ "${p}view/svc_domain.cgi", 'svcnum' ];
+my $link = [ "${p}view/svc_domain.cgi?", 'svcnum' ];
 
 #smaller false laziness w/svc_*.cgi here
 my $link_cust = sub {
@@ -61,7 +61,7 @@ my $link_cust = sub {
   $svc_x->custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] : '';
 };
 
-%><%= include ('elements/search.html',
+%><%= include( 'elements/search.html',
                  'title'             => "Domain Search Results",
                  'name'              => 'domains',
                  'query'             => $sql_query,
@@ -69,15 +69,17 @@ my $link_cust = sub {
                  'redirect'          => $link,
                  'header'            => [ '#',
                                           'Domain',
-                                          'Customer',
+                                          FS::UI::Web::cust_header(),
                                         ],
                  'fields'            => [ 'svcnum',
                                           'domain',
-                                          \&FS::svc_Common::cust_name,
+                                          \&FS::UI::Web::cust_fields,
                                         ],
                  'links'             => [ $link,
                                           $link,
-                                          $link_cust,
+                                          ( map { $link_cust }
+                                                FS::UI::Web::cust_header()
+                                          ),
                                         ],
               )
 %>