[freeside-commits] freeside/httemplate/search svc_broadband.cgi, 1.11, 1.12

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv21235

Modified Files:
	svc_broadband.cgi 
Log Message:
fix customer fields selection on advanded svc_broadband report, RT#16047

Index: svc_broadband.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_broadband.cgi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -d -r1.11 -r1.12
--- svc_broadband.cgi	17 Sep 2010 18:07:08 -0000	1.11
+++ svc_broadband.cgi	13 Jan 2012 03:26:37 -0000	1.12
@@ -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 @@
 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' ];