From 39eaf5704bd78a458e6734f8ea2f1e07a60d4196 Mon Sep 17 00:00:00 2001
From: levinse <levinse>
Date: Wed, 22 Jun 2011 23:41:27 +0000
Subject: [PATCH] add router and addr_block delete features, RT13197

---
 httemplate/browse/addr_block.cgi       |  3 ---
 httemplate/browse/router.cgi           |  3 +++
 httemplate/misc/delete-addr_block.html | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 httemplate/misc/delete-addr_block.html

diff --git a/httemplate/browse/addr_block.cgi b/httemplate/browse/addr_block.cgi
index 7ff0eaa21..46b12e65f 100644
--- a/httemplate/browse/addr_block.cgi
+++ b/httemplate/browse/addr_block.cgi
@@ -158,7 +158,4 @@ my $autoassign_link = sub {
   [ "$url;blocknum=", 'blocknum' ];
 }; 
 
-my $delete_link = sub {
-};
-
 </%init>
diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index 541e967dd..069ca9b20 100644
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -9,15 +9,18 @@
                 'count_query'     => "SELECT count(*) from router $count_sql",
                 'header'          => [ 'Router name',
                                        'Address block(s)',
+                                       'Action',
                                      ],
                 'fields'          => [ 'routername',
                                        sub { join( '<BR>', map { $_->NetAddr }
                                                                shift->addr_block
                                                  );
                                            },
+                                       sub { 'Delete' },
                                      ],
                 'links'           => [ [ "${p2}edit/router.cgi?", 'routernum' ],
                                        '',
+                                       [ "${p}misc/delete-router.html?", 'routernum' ],
                                      ],
                 'agent_virt'      => 1,
                 'agent_null_right'=> "Broadband global configuration",
diff --git a/httemplate/misc/delete-addr_block.html b/httemplate/misc/delete-addr_block.html
new file mode 100644
index 000000000..83a4b6823
--- /dev/null
+++ b/httemplate/misc/delete-addr_block.html
@@ -0,0 +1,19 @@
+% if ( $error ) {
+%   errorpage($error);
+% } else {
+<% $cgi->redirect("${p}browse/addr_block.cgi") %>
+% }
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Broadband configuration')
+  || $FS::CurrentUser::CurrentUser->access_right('Broadband global configuration');
+
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/ || die "Illegal blocknum";
+my $blocknum = $1;
+
+my $addr_block = qsearchs('addr_block',{'blocknum'=>$blocknum});
+my $error = $addr_block->delete;
+
+</%init>
-- 
2.11.0