Merge branch 'patch-6' of https://github.com/gjones2/Freeside (#13854 as this bug...

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

diff --git a/httemplate/edit/tower.html b/httemplate/edit/tower.html
index c27d9d2..03b488e 100644 (file)
--- a/httemplate/edit/tower.html
+++ b/httemplate/edit/tower.html
@@ -4,17 +4,24 @@
      viewall_dir   => 'browse',
      fields        => [ 'towername',
                         { field=>'disabled', type=>'checkbox', value=>'Y', },
+                        { field             => 'default_ip_addr',
+                          curr_value_callback => $default_ip_addr_callback },
                         { field             => 'sectornum',
                           type              => 'tower_sector',
                           o2m_table         => 'tower_sector',
                           m2_label          => 'Sector',
                           m2_error_callback => $m2_error_callback,
                         },
+                        'latitude',
+                        'longitude',
                       ],
      labels        => { 'towernum'  => 'Tower',
                         'towername' => 'Name',
                         'sectornum' => 'Sector',
                         'disabled'  => 'Disabled',
+                        'default_ip_addr' => 'Tower IP address',
+                        'latitude' => 'Latitude',
+                        'longitude' => 'Longitude',
                       },
 &>
 <%init>
@@ -34,4 +41,10 @@ my $m2_error_callback = sub { # reconstruct the list
   } grep /^sectornum\d+$/, ($cgi->param);
 };
 
+my $default_ip_addr_callback = sub {
+  my ($cgi, $object) = @_;
+  my $sector = $object ? $object->default_sector : '';
+  $sector ? $sector->ip_addr : '';
+};
+
 </%init>