RT# 83205 - fixed error with fields being sticky on error

[freeside.git] / httemplate / edit / tower.html

diff --git a/httemplate/edit/tower.html b/httemplate/edit/tower.html
index 4d8ad1e..f2faa5a 100644 (file)
--- a/httemplate/edit/tower.html
+++ b/httemplate/edit/tower.html
@@ -2,6 +2,7 @@
      name_singular => 'tower',
      table         => 'tower',
      viewall_dir   => 'browse',
+     html_init     => include('/elements/mapselect.html'),
      fields        => [ 'towername',
                         { field=>'disabled', type=>'checkbox', value=>'Y', },
                         { field=>'color',    type=>'pickcolor' },
@@ -12,11 +13,17 @@
                         'altitude',
                         'height',
                         'veg_height',
-                        { field             => 'sectornum',
-                          type              => 'tower_sector',
-                          o2m_table         => 'tower_sector',
-                          m2_label          => 'Sector',
-                          m2_error_callback => $m2_error_callback,
+                        'up_rate_limit',
+                        'down_rate_limit',
+#                        { field             => 'sectornum',
+#                          type              => 'tower_sector',
+#                          o2m_table         => 'tower_sector',
+#                          m2_label          => 'Sector',
+#                          m2_error_callback => $m2_error_callback,
+#                        },
+                        { type              => 'tower_sectors',
+                          field             => 'sectornum',
+                          # does its own o2m-thing
                         },
                       ],
      labels        => { 'towernum'        => 'Tower',
@@ -27,9 +34,11 @@
                         'latitude'        => 'Latitude',
                         'longitude'       => 'Longitude',
                         'altitude'        => 'Altitude (feet)',
-                        'height'          => 'Height (feet)',
+                        'height'          => 'Tower height (feet)',
                         'veg_height'      => 'Vegetation height (feet)',
                         'color'           => 'Color',
+                        'up_rate_limit'   => 'Up Rate Limit(Kbps)',
+                        'down_rate_limit' => 'Down Rate Limit(Kbps)',
                       },
 &>
 <%init>
@@ -38,19 +47,23 @@ my $m2_error_callback = sub { # reconstruct the list
   my ($cgi, $object) = @_;
 
   my @fields = qw(
-    sectorname ip_addr height freq_mhz direction width sector_range
+    sectorname ip_addr height freq_mhz direction width tilt v_width db_high db_low sector_range up_rate_limit down_rate_limit
   );
 
-  map {
-    my $k = $_;
-    new FS::tower_sector {
-      'towernum'  => $object->towernum,
-      'sectornum' => scalar( $cgi->param($k) ),
-      map { $_ => scalar( $cgi->param($k.'_'.$_) ) } @fields,
-    };
-  } grep length($cgi->param($_.'_sectorname')),
-      grep /^sectornum\d+$/,
-        ($cgi->param);
+  my @sectors;
+  foreach my $k ($cgi->param) {
+    if ($k =~ /^sectornum\d+$/) {
+      my $sectornum = $cgi->param($k);
+      my $sector = FS::tower_sector->new({
+        'sectornum' => $sectornum,
+        'towernum'  => $object->towernum,
+        map { $_ => scalar($cgi->param($k.'_'.$_)) } @fields,
+      });
+      push @sectors, $sector if length($sector->sectorname) && $sector->sectorname ne '_default';
+    }
+  }
+
+  return @sectors;
 };
 
 my $default_ip_addr_callback = sub {