From c7c6a9bf1d1f66b5aaf82b2836cd560b64b768a8 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 13 Jan 2012 03:26:38 +0000 Subject: [PATCH] fix customer fields selection on advanded svc_broadband report, RT#16047 --- httemplate/search/svc_broadband.cgi | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/httemplate/search/svc_broadband.cgi b/httemplate/search/svc_broadband.cgi index 7026f52e3..403396b99 100755 --- a/httemplate/search/svc_broadband.cgi +++ b/httemplate/search/svc_broadband.cgi @@ -9,20 +9,23 @@ 'Service', 'Router', 'IP Address', - FS::UI::Web::cust_header(), + FS::UI::Web::cust_header($cgi->param('cust_fields')), ], 'fields' => [ 'svcnum', 'svc', - sub { $routerbyblock{shift->blocknum}->routername; }, + sub { + my $blocknum = shift->blocknum or return ''; + $routerbyblock{$blocknum}->routername; + }, 'ip_addr', \&FS::UI::Web::cust_fields, ], 'links' => [ $link, $link, - $link_router, + '', #$link_router, $link, ( map { $_ ne 'Cust. Status' ? $link_cust : '' } - FS::UI::Web::cust_header() + FS::UI::Web::cust_header($cgi->param('cust_fields')) ), ], 'align' => 'rllr'. FS::UI::Web::cust_aligns(), @@ -78,9 +81,10 @@ foreach my $router (qsearch('router', {})) { my $link = [ $p.'view/svc_broadband.cgi?', 'svcnum' ]; #XXX get the router link working -my $link_router = sub { my $routernum = $routerbyblock{shift->blocknum}->routernum; - [ $p.'view/router.cgi?'.$routernum, 'routernum' ]; - }; +#my $link_router = sub { +# my $routernum = $routerbyblock{shift->blocknum}->routernum; +# [ $p.'view/router.cgi?'.$routernum, 'routernum' ]; +#}; my $link_cust = [ $p.'view/cust_main.cgi?', 'custnum' ]; -- 2.11.0