fix advanced package report, RT#40292, fallout from RT#20173

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

diff --git a/httemplate/search/svc_broadband.cgi b/httemplate/search/svc_broadband.cgi
index 605b829..8561977 100755 (executable)
--- a/httemplate/search/svc_broadband.cgi
+++ b/httemplate/search/svc_broadband.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/svc_Common.html,
               'title'       => 'Broadband Search Results',
               'name'        => 'broadband services',
               'html_init'   => $html_init,
@@ -15,8 +15,8 @@
               'fields'      => [ 'svcnum',
                                  'svc',
                                  sub {
-                                   my $blocknum = shift->blocknum or return '';
-                                   $routerbyblock{$blocknum}->routername;
+                                   my $router = shift->router; 
+                                   $router ? $router->routername : '';
                                  },
                                  @tower_fields,
                                  'ip_addr',
@@ -49,8 +49,8 @@
                                  '',
                                  FS::UI::Web::cust_styles(),
                                ],
-          )
-%>
+          
+&>
 <%init>
 
 die "access denied" unless
@@ -61,9 +61,8 @@ my $conf = new FS::Conf;
 my %search_hash;
 if ( $cgi->param('magic') eq 'unlinked' ) {
   %search_hash = ( 'unlinked' => 1 );
-}
-else {
-  foreach (qw(custnum agentnum svcpart)) {
+} else {
+  foreach (qw( custnum agentnum svcpart cust_fields )) {
     $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
   }
   foreach (qw(pkgpart routernum towernum sectornum)) {
@@ -72,7 +71,7 @@ else {
 }
 
 if ( $cgi->param('sortby') =~ /^(\w+)$/ ) {
-  $search_hash{'order_by'} = $1;
+  $search_hash{'order_by'} = "ORDER BY $1";
 }
 
 my $sql_query = FS::svc_broadband->search(\%search_hash);