X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Faddr_block.cgi;h=46b12e65f155de0525c49cc798c857dfbb16874f;hb=7d34aacffa38c4cac09b54080487a66c264e4668;hp=917f94c965ff98796a07924116336d3d61880af9;hpb=a1871d3d13c1dafa93b956762c0d23728d261da7;p=freeside.git

diff --git a/httemplate/browse/addr_block.cgi b/httemplate/browse/addr_block.cgi
index 917f94c96..46b12e65f 100644
--- a/httemplate/browse/addr_block.cgi
+++ b/httemplate/browse/addr_block.cgi
@@ -13,6 +13,8 @@
                                      'Router',
                                      'Action(s)',
                                      '',
+                                     '',
+                                     '',
                                    ],
                 'fields'        => [ 'NetAddr',
                                      sub { my $block = shift;
@@ -26,32 +28,49 @@
                                          },
                                      $allocate_text,
                                      sub { shift->router ? '' : '<FONT SIZE="-2">(split)</FONT>' },
+                                     sub { '<FONT SIZE="-2">('. (shift->manual_flag ? 'allow' : 'prevent'). ' automatic ip assignment)</FONT>' },
+                                     sub { 
+                                        my $block = shift;
+                                        if(!$block->router && scalar($block->svc_broadband) == 0) {
+                                            return '<FONT SIZE="-2">(delete)</FONT>';
+                                        }
+                                        '';
+                                     },
                                    ],
                 'links'         => [ '',
                                      '',
                                      [ 'javascript:void(0)', '' ],
                                      $split_link,
+                                     $autoassign_link,
+                                     sub {
+                                        my $block = shift;
+                                        if(!$block->router && scalar($block->svc_broadband) == 0) {
+                                            [ "${p}misc/delete-addr_block.html?", 'blocknum' ];
+                                        }
+                                     },
                                    ],
                 'link_onclicks' => [ '',
                                      '',
                                      $allocate_link,
                                      '',
+                                     '',
                                    ],
                 'cell_styles'   => [ '',
                                      '',
                                      'border-right:none;',
                                      'border-left:none;',
+                                     '',
                                    ],
                 'agent_virt'    => 1,
-                'agent_null_right' => 'Engineering global configuration',
+                'agent_null_right' => 'Broadband global configuration',
                 'agent_pos'     => 1,
           )
 %>
 <%init>
 
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Engineering configuration')
-  || $FS::CurrentUser::CurrentUser->access_right('Engineering global configuration');
+  unless $FS::CurrentUser::CurrentUser->access_right('Broadband configuration')
+  || $FS::CurrentUser::CurrentUser->access_right('Broadband global configuration');
 
 my $p2 = popurl(2);
 my $path = $p2 . "edit/process/addr_block";
@@ -59,7 +78,7 @@ my $path = $p2 . "edit/process/addr_block";
 my $extra_sql = "";
 
 my $count_sql = "WHERE ". $FS::CurrentUser::CurrentUser->agentnums_sql(
-  'null_right' => 'Engineering global configuration',
+  'null_right' => 'Broadband global configuration',
 );
 
 my $order_by = "ORDER BY ";
@@ -89,8 +108,7 @@ my $html_foot = qq(
   <INPUT TYPE="text" NAME="ip_gateway" SIZE="15">/<INPUT TYPE="text" NAME="ip_netmask" SIZE="2">
 );
 $html_foot .= include( '/elements/select-agent.html',
-                       'agent_virt'       => 1,
-                       'agent_null_right' => 'Engineering global configuration',
+                         'agent_null_right' => 'Broadband global configuration',
                      );
 $html_foot .= qq(
   <INPUT TYPE="submit" NAME="submit" VALUE="Add">
@@ -133,4 +151,11 @@ my $split_link = sub {
   $ref;
 }; 
 
+my $autoassign_link = sub {
+  my $block = shift;
+  my $url = "$path/manual_flag.cgi?manual_flag=";
+  $url .=  $block->manual_flag ? '' : 'Y';
+  [ "$url;blocknum=", 'blocknum' ];
+}; 
+
 </%init>