X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Frouter.cgi;h=85512f8df1a2835b45c6023eb589862118f83d5f;hb=29d80a8582103ead0b5910391cabc45cb85fa836;hp=9d856f67c8b1d9297764f78b7dcf94cea0ce33ca;hpb=2eda79fb265b3acdde85881f1160f6daa73f2d84;p=freeside.git

diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index 9d856f67c..85512f8df 100644
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -6,25 +6,35 @@
                                        'hashref'   => {},
                                        'extra_sql' => $extra_sql,
                                      },
-                'count_query'     => "SELECT count(*) from router $extra_sql",
+                'count_query'     => "SELECT count(*) from router $count_sql",
                 'header'          => [ 'Router name',
                                        'Address block(s)',
+                                       'IP addressing',
+                                       'Action',
                                      ],
                 'fields'          => [ 'routername',
                                        sub { join( '<BR>', map { $_->NetAddr }
                                                                shift->addr_block
                                                  );
                                            },
+                                       sub { shift->manual_addr ? 'Manual' : 'Automatic' },
+                                       sub { 'Delete' },
                                      ],
                 'links'           => [ [ "${p2}edit/router.cgi?", 'routernum' ],
                                        '',
+                                       '',
+                                       [ "${p}misc/delete-router.html?", 'routernum' ],
                                      ],
+                'agent_virt'      => 1,
+                'agent_null_right'=> "Broadband global configuration",
+                'agent_pos'       => 1,
           )
 %>
 <%init>
 
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+  unless $FS::CurrentUser::CurrentUser->access_right('Broadband configuration')
+  || $FS::CurrentUser::CurrentUser->access_right('Broadband global configuration');
 
 my $p2 = popurl(2);
 my $extra_sql = '';
@@ -33,11 +43,19 @@ my @menubar = ( 'Add a new router', "${p2}edit/router.cgi" );
 
 if ($cgi->param('hidecustomerrouters') eq '1') {
   $extra_sql = 'WHERE svcnum > 0';
-  $cgi->param('hidecustomerrouters', 0);
+  $cgi->delete('hidecustomerrouters');
   push @menubar, 'Show customer routers', $cgi->self_url();
+  $cgi->param('hidecustomerrouters', 1);
 } else {
   $cgi->param('hidecustomerrouters', 1);
   push @menubar, 'Hide customer routers', $cgi->self_url();
+  $cgi->delete('hidecustomerrouters');
 }
 
+my $count_sql = $extra_sql.  ( $extra_sql =~ /WHERE/ ? ' AND' : 'WHERE' ).
+  $FS::CurrentUser::CurrentUser->agentnums_sql(
+    'null_right' => 'Broadband global configuration',
+  );
+
+
 </%init>