X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Frouter.cgi;h=541e967ddf34ef2b6cebe1fdcaf83b7df4792139;hp=7ed0963db006c74e22a64d27ce2f86a1a66d468e;hb=6873aec01740ea7c70a5e20a3f3bce6e76bca410;hpb=2a6aa24137ddd389c1e644f5ece325c5b5dbaf3a

diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index 7ed0963db..541e967dd 100644
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -1,58 +1,52 @@
-<% include("/elements/header.html",'Routers', menubar('Main Menu'   => $p)) %>
-%
-%my @router = qsearch('router', {});
-%my $p2 = popurl(2);
-
-<% include('/elements/error.html') %>
-
-%my $hidecustomerrouters = 0;
-%my $hideurl = '';
-%if ($cgi->param('hidecustomerrouters') eq '1') {
-%  $hidecustomerrouters = 1;
-%  $cgi->param('hidecustomerrouters', 0);
-%  $hideurl = '<A HREF="' . $cgi->self_url() . '">Show customer routers</A>';
-%} else {
-%  $hidecustomerrouters = 0;
-%  $cgi->param('hidecustomerrouters', 1);
-%  $hideurl = '<A HREF="' . $cgi->self_url() . '">Hide customer routers</A>';
-%}
-%
-
+<% include('elements/browse.html',
+                'title'           => 'Routers',
+                'menubar'         => [ @menubar ],
+                'name_singular'   => 'router',
+                'query'           => { 'table'     => 'router',
+                                       'hashref'   => {},
+                                       'extra_sql' => $extra_sql,
+                                     },
+                'count_query'     => "SELECT count(*) from router $count_sql",
+                'header'          => [ 'Router name',
+                                       'Address block(s)',
+                                     ],
+                'fields'          => [ 'routername',
+                                       sub { join( '<BR>', map { $_->NetAddr }
+                                                               shift->addr_block
+                                                 );
+                                           },
+                                     ],
+                'links'           => [ [ "${p2}edit/router.cgi?", 'routernum' ],
+                                       '',
+                                     ],
+                'agent_virt'      => 1,
+                'agent_null_right'=> "Broadband global configuration",
+                'agent_pos'       => 1,
+          )
+%>
+<%init>
 
-<A HREF="<%$p2%>edit/router.cgi">Add a new router</A>&nbsp;|&nbsp;<%$hideurl%>
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Broadband configuration')
+  || $FS::CurrentUser::CurrentUser->access_right('Broadband global configuration');
 
-<%table()%>
-  <TR>
-    <TD><B>Router name</B></TD>
-    <TD><B>Address block(s)</B></TD>
-  </TR>
-% foreach my $router (sort {$a->routernum <=> $b->routernum} @router) {
-%     next if $hidecustomerrouters && $router->svcnum;
-%     my @addr_block = $router->addr_block;
-%     if (scalar(@addr_block) == 0) {
-%       push @addr_block, '&nbsp;';
-%     }
-%
+my $p2 = popurl(2);
+my $extra_sql = '';
 
-  <TR>
-    <TD ROWSPAN="<%scalar(@addr_block)+1%>">
-      <A HREF="<%$p2%>edit/router.cgi?<%$router->routernum%>"><%$router->routername%></A>
-    </TD>
-  </TR>
-% foreach my $block ( @addr_block ) { 
+my @menubar = ( 'Add a new router', "${p2}edit/router.cgi" );
 
-  <TR>
-    <TD><%UNIVERSAL::isa($block, 'FS::addr_block') ? $block->NetAddr : '&nbsp;'%></TD>
-  </TR>
-% } 
+if ($cgi->param('hidecustomerrouters') eq '1') {
+  $extra_sql = 'WHERE svcnum > 0';
+  $cgi->param('hidecustomerrouters', 0);
+  push @menubar, 'Show customer routers', $cgi->self_url();
+} else {
+  $cgi->param('hidecustomerrouters', 1);
+  push @menubar, 'Hide customer routers', $cgi->self_url();
+}
 
-  </TR>
-% } 
+my $count_sql = $extra_sql.  ( $extra_sql =~ /WHERE/ ? ' AND' : 'WHERE' ).
+  $FS::CurrentUser::CurrentUser->agentnums_sql(
+    'null_right' => 'Broadband global configuration',
+  );
 
-</TABLE>
-</BODY>
-</HTML>
-<%init>
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 </%init>