X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_broadband.cgi;h=bcf55fe11a73cd9a1e37f32d8f016634846b885a;hp=b266928a16dfb88e3da20582e91431fd25b40028;hb=b71b1576c68bc40ad26592b354feace37a029f0e;hpb=7d68066ea33f9f85fe14ce663372642d7ec2ad20

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index b266928a1..bcf55fe11 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -3,7 +3,7 @@
      'name'                 => 'broadband service',
      'table'                => 'svc_broadband',
      'fields'               => \@fields, 
-     'field_callback'       => $field_callback,
+     'svc_field_callback'   => $svc_field_callback,
      'svc_new_callback'     => $svc_edit_callback,
      'svc_edit_callback'    => $svc_edit_callback,
      'svc_error_callback'   => $svc_edit_callback,
@@ -100,12 +100,25 @@ END
 ;
 
 my @fields = (
-  qw( description speed_down speed_up ),
+  qw( description speed_down speed_up speed_test_down speed_test_up speed_test_latency),
   { field=>'sectornum', type=>'select-tower_sector', },
-  { field=>'routernum', type=>'select-router_block_ip' },
+  { field=>'routernum', type=>'select-router_block_ip', 
+    include_opt_callback => sub { 
+      my $svc_broadband = shift;
+      my $part_svc = $svc_broadband->part_svc;
+      return () unless $part_svc; #sanity check
+      my $col = $part_svc->part_svc_column('ip_addr');
+      return () unless $col; #sanity check
+      return ('ip_addr_required' => $col->required);
+    },
+  },
   { field=>'mac_addr' , type=>'input-mac_addr' },
-    qw( latitude longitude altitude vlan_profile 
-    performance_profile authkey plan_id )
+  qw(
+      latitude longitude altitude
+      radio_serialnum radio_location poe_location rssi suid
+    ),
+  { field=>'shared_svcnum', type=>'search-svc_broadband', },
+  qw( vlan_profile performance_profile authkey plan_id ),
 );
 
 if ( $conf->exists('svc_broadband-radius') ) {
@@ -161,20 +174,13 @@ my $svc_edit_callback = sub {
   }
 };
 
-my $field_callback = sub {
+my $svc_field_callback = sub {
   my ($cgi, $object, $fieldref) = @_;
 
   my $columndef = $part_svc->part_svc_column($fieldref->{'field'});
-  if ($columndef->columnflag eq 'F') {
-    $fieldref->{'type'} = length($columndef->columnvalue)
-                            ? 'fixed'
-                            : 'hidden';
-    $fieldref->{'value'} = $columndef->columnvalue;
-    
-    if ( $fieldref->{field} eq 'usergroup' ) {
-      $fieldref->{'formatted_value'} = 
-        [ $object->radius_groups('long_description') ];
-    }
+  if ($fieldref->{field} eq 'usergroup' && $columndef->columnflag eq 'F') {
+    $fieldref->{'formatted_value'} = 
+      [ $object->radius_groups('long_description') ];
   }
 
 };