X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fsearch%2Fcust_svc.html;h=72ecb8e356455c5fe25f8c0fac87d67f212b1514;hb=e168ca3db2702bd9a540316cd9bd840238dd19ce;hp=6369b202e8103b65f46ac8e5c67d5c989f892a1a;hpb=590603ecaea3184f64530755a76626be8205da49;p=freeside.git

diff --git a/httemplate/search/cust_svc.html b/httemplate/search/cust_svc.html
index 6369b202e..72ecb8e35 100644
--- a/httemplate/search/cust_svc.html
+++ b/httemplate/search/cust_svc.html
@@ -1,11 +1,11 @@
-<% include( 'elements/search.html',
-              'title'       => 'Service search results',
-	      'name'        => 'services',
+<& elements/search.html,
+          'title'       => emt('Service search results'),
+	      'name'        => emt('services'),
 	      'query'       => $sql_query,
 	      'count_query' => $count_query,
 	      'redirect'    => $link,
-	      'header'      => [ '#',
-	                         'Service',
+	      'header'      => [ emt('#'),
+	                         emt('Service'),
 				 # package?
 				 FS::UI::Web::cust_header(),
 	                       ],
@@ -36,8 +36,7 @@
                            '',
                            FS::UI::Web::cust_styles(),
                          ],
-          )
-%>
+&>
 <%init>
 
 die "access denied"
@@ -90,11 +89,13 @@ if ( length( $cgi->param('search_svc') ) ) {
   push @extra_sql, "svcpart = $1";
 
 } else {
-  eidiot("No search term specified");
+  errorpage("No search term specified");
 }
 
 #here is the agent virtualization
-push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql( 
+                   'null_right' => 'View/link unlinked services'
+                 );
 
 my $extra_sql = ' WHERE '. join(' AND ', @extra_sql );
 
@@ -108,14 +109,15 @@ my $sql_query = {
   'table'      => 'cust_svc',
   'addl_from'  => $addl_from,
   'hashref'    => {},
-  'extra_sql'  => "$extra_sql $orderby",
+  'extra_sql'  => $extra_sql,
+  'order_by'   => $orderby,
 };
 
 my $count_query = "SELECT COUNT(*) FROM cust_svc $addl_from $extra_sql";
 
 my $link = sub {
   my $cust_svc = shift;
-  my $url = FS::UI::Web::svc_url(
+  my $url = svc_url(
     'm'        => $m,
     'action'   => 'view',
     #'part_svc' => $cust_svc->part_svc,