From ccb98cbde1747707e3ea8a4c1c8b75d737f1e653 Mon Sep 17 00:00:00 2001 From: jeff Date: Fri, 18 Apr 2008 16:27:44 +0000 Subject: [PATCH] backout browse changes until 1.7.4 --- httemplate/browse/addr_block.cgi | 194 ++++++++++-------------- httemplate/browse/router.cgi | 103 ++++++++----- httemplate/edit/process/addr_block/allocate.cgi | 33 +++- 3 files changed, 176 insertions(+), 154 deletions(-) diff --git a/httemplate/browse/addr_block.cgi b/httemplate/browse/addr_block.cgi index d597ee17e..7a9351918 100644 --- a/httemplate/browse/addr_block.cgi +++ b/httemplate/browse/addr_block.cgi @@ -1,121 +1,91 @@ -<% include('elements/browse.html', - 'title' => 'Address Blocks', - 'name' => 'address block', - 'html_init' => $html_init, - 'html_form' => $html_form, - 'query' => { 'table' => 'addr_block', - 'hashref' => {}, - 'extra_sql' => $extra_sql, - 'order_by' => $order_by, - }, - 'count_query' => "SELECT count(*) from addr_block $extra_sql", - 'header' => [ 'Address Block', - 'Router', - 'Action(s)', - '', - ], - 'fields' => [ 'NetAddr', - sub { my $block = shift; - my $router = $block->router; - my $result = ''; - if ($router) { - $result .= $router->routername. ' ('; - $result .= scalar($block->svc_broadband). ' services)'; - } - $result; - }, - $allocate_text, - sub { shift->router ? '' : '(split)' }, - ], - 'links' => [ '', - '', - [ 'javascript:void(0)', '' ], - $split_link, - ], - 'link_onclicks' => [ '', - '', - $allocate_link, - '', - ], - 'cell_styles' => [ '', - '', - 'border-right:none;', - 'border-left:none;', - ], - ) -%> +<% include('/elements/header.html', 'Address Blocks') %> + +<% include('/elements/error.html') %> + +<% include('/elements/table-grid.html') %> +% my $bgcolor1 = '#eeeeee'; +% my $bgcolor2 = '#ffffff'; +% my $bgcolor = ''; + + + Address block(s) + Router + Action(s) + + +% foreach $block (sort {$a->NetAddr cmp $b->NetAddr} @addr_block) { +% if ( $bgcolor eq $bgcolor1 ) { +% $bgcolor = $bgcolor2; +% } else { +% $bgcolor = $bgcolor1; +% } + + + <%$block->NetAddr%> + +% if (my $router = $block->router) { +% +% if (scalar($block->svc_broadband) == 0) { + + + <%$router->routername%> + + +
+ + +
+ +% } else { + + + <%$router->routername%> + +% } +% +% } else { + + +
+ + + +
+ + +
+ + +
+ + +% } + + +% } + + + +

+
+Gateway/Netmask: +/ + + +<% include('/elements/footer.html') %> <%init> die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); +my @addr_block = qsearch('addr_block', {}); +my @router = qsearch('router', {}); +my $block; my $p2 = popurl(2); my $path = $p2 . "edit/process/addr_block"; -my $extra_sql = " "; -my $order_by = "ORDER BY "; -$order_by .= "inet(ip_gateway), " if driver_name =~ /^Pg/i; -$order_by .= "inet_aton(ip_gateway), " if driver_name =~ /^mysql/i; -$order_by .= "ip_netmask"; - -my $html_init = qq( - -); - -$html_init .= include('/elements/error.html'); - -my $confirm = sub { - my ($verb, $num) = (shift, shift); - "javascript:addr_block_areyousure('$path/$verb.cgi?blocknum=$num', '$verb')"; -}; - -my $html_form = qq( - - Gateway/Netmask: - / - -
-); - -my $allocate_text = sub { my $block = shift; - my $router = $block->router; - my $result = ''; - if ($router) { - $result = '(deallocate)' - unless scalar($block->svc_broadband); - }else{ - $result .= '(allocate)' - } - $result; -}; - -my $allocate_link = sub { - my $block = shift; - if ($block->router) { - if (scalar($block->svc_broadband) == 0) { - &{$confirm}('deallocate', $block->blocknum); - } else { - ""; - } - } else { - include( '/elements/popup_link_onclick.html', - 'action' => "${p2}edit/allocate.html?blocknum=". $block->blocknum, - 'actionlabel' => 'Allocate block to router', - ); - } -}; - -my $split_link = sub { - my $block = shift; - my $ref = [ '', '' ]; - $ref = [ &{$confirm}('split', $block->blocknum), '' ] - unless ($block->router); - $ref; -}; - diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi index 9d856f67c..a52f609a1 100644 --- a/httemplate/browse/router.cgi +++ b/httemplate/browse/router.cgi @@ -1,43 +1,76 @@ -<% 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 $extra_sql", - 'header' => [ 'Router name', - 'Address block(s)', - ], - 'fields' => [ 'routername', - sub { join( '
', map { $_->NetAddr } - shift->addr_block - ); - }, - ], - 'links' => [ [ "${p2}edit/router.cgi?", 'routernum' ], - '', - ], - ) -%> +<% include('/elements/header.html', 'Routers') %> + +<% include('/elements/error.html') %> + +%my $hidecustomerrouters = 0; +%my $hideurl = ''; +%if ($cgi->param('hidecustomerrouters') eq '1') { +% $hidecustomerrouters = 1; +% $cgi->param('hidecustomerrouters', 0); +% $hideurl = 'Show customer routers'; +%} else { +% $hidecustomerrouters = 0; +% $cgi->param('hidecustomerrouters', 1); +% $hideurl = 'Hide customer routers'; +%} + +Add a new router | <%$hideurl%> + +<% include('/elements/table-grid.html') %> +% my $bgcolor1 = '#eeeeee'; +% my $bgcolor2 = '#ffffff'; +% my $bgcolor = ''; + + + Router name + Address block(s) + + +% 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, ' '; +% } +% +% if ( $bgcolor eq $bgcolor1 ) { +% $bgcolor = $bgcolor2; +% } else { +% $bgcolor = $bgcolor1; +% } + + + + + <%$router->routername%> + + + + + +% foreach my $block ( @addr_block ) { + + + + +% } +
<%UNIVERSAL::isa($block, 'FS::addr_block') ? $block->NetAddr : ' '%>
+ + + + +% } + + + +<% include('/elements/footer.html') %> + <%init> die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); +my @router = qsearch('router', {}); my $p2 = popurl(2); -my $extra_sql = ''; - -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); - push @menubar, 'Show customer routers', $cgi->self_url(); -} else { - $cgi->param('hidecustomerrouters', 1); - push @menubar, 'Hide customer routers', $cgi->self_url(); -} diff --git a/httemplate/edit/process/addr_block/allocate.cgi b/httemplate/edit/process/addr_block/allocate.cgi index d1bd73f1f..fb361b05c 100755 --- a/httemplate/edit/process/addr_block/allocate.cgi +++ b/httemplate/edit/process/addr_block/allocate.cgi @@ -1,10 +1,29 @@ -<% include( '../elements/process.html', - 'table' => 'addr_block', - 'copy_on_empty' => [ fields 'addr_block' ], - 'error_redirect' => popurl(3). 'allocate.html?', - 'popup_reload' => 'Block allocated', - ) -%> +% +%my $error = ''; +%my $blocknum = $cgi->param('blocknum'); +%my $routernum = $cgi->param('routernum'); +% +%my $addr_block = qsearchs('addr_block', { blocknum => $blocknum }); +%my $router = qsearchs('router', { routernum => $routernum }); +% +%if($addr_block) { +% if ($router) { +% $error = $addr_block->allocate($router); +% } else { +% $error = "Cannot find router with routernum $routernum"; +% } +%} else { +% $error = "Cannot find block with blocknum $blocknum"; +%} +% +%if ( $error ) { +% $cgi->param('error', $error); +% print $cgi->redirect(popurl(4). "browse/addr_block.cgi?" . $cgi->query_string); +%} else { +% print $cgi->redirect(popurl(4). "browse/addr_block.cgi"); +%} +% + <%init> my $conf = new FS::Conf; -- 2.11.0