diff options
author | Christopher Burger <burgerc@freeside.biz> | 2018-03-27 09:20:05 -0400 |
---|---|---|
committer | Christopher Burger <burgerc@freeside.biz> | 2018-03-29 13:48:14 -0400 |
commit | 34e816379204ad4b19d282f5478a566d1465f4ea (patch) | |
tree | a8e5389882f051ad881cca9ba8b60f5c936b7d06 /httemplate | |
parent | d81d88c7ec4a69aaf14a9da961e16c8af630fd68 (diff) |
RT# 78356 - added ability to create and modify rateplans and access point when changed on freeside. cleanded up documentation.
Conflicts:
FS/FS/part_export/saisei.pm
FS/FS/tower_sector.pm
httemplate/edit/process/tower.html
httemplate/edit/tower.html
Diffstat (limited to 'httemplate')
-rw-r--r-- | httemplate/edit/part_export.cgi | 14 | ||||
-rw-r--r-- | httemplate/edit/process/elements/process.html | 8 | ||||
-rw-r--r-- | httemplate/edit/process/tower.html | 2 | ||||
-rw-r--r-- | httemplate/edit/tower.html | 10 | ||||
-rw-r--r-- | httemplate/elements/tr-tower_sectors.html | 14 |
5 files changed, 35 insertions, 13 deletions
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi index 5411feb5f..381fbcaf8 100644 --- a/httemplate/edit/part_export.cgi +++ b/httemplate/edit/part_export.cgi @@ -290,6 +290,20 @@ my $widget = new HTML::Widgets::SelectLayers( $html .= ' CHECKED' if $part_export->no_suspend eq 'Y'; $html .= '></TD></TR>'; + foreach my $script ( keys %{$exports->{$layer}{scripts}} ) { + $html .= '<TR><TD ALIGN="left" COLSPAN=2>' . + include('/elements/progress-init.html', + $part_export->exportname, + [ $script.'_exportnum', $script.'_script' ], + rooturl().'view/svc_export/run_script.cgi', + rooturl().'edit/part_export.cgi?'.$part_export->{Hash}->{exportnum}, + $script, + ) . + '<INPUT TYPE="hidden" NAME="'.$script.'_exportnum" VALUE="'.$part_export->{Hash}->{exportnum}.'"> + <INPUT TYPE="hidden" NAME="'.$script.'_script" VALUE="'.$script.'"> + <A HREF="#" onClick="'.$script.'process();">'.$exports->{$layer}{scripts}{$script}->{html_label}.'</A></TD></TR>'; + } + $html .= '</TABLE>'; # false laziness with config_element above diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html index 60aaf749a..e96fa0c4f 100644 --- a/httemplate/edit/process/elements/process.html +++ b/httemplate/edit/process/elements/process.html @@ -459,6 +459,14 @@ foreach my $value ( @values ) { } +if ($class eq "FS::tower") { + foreach my $part_svc_broadband_export ( FS::tower_sector->part_export_svc_broadband ) { + if ($part_svc_broadband_export and $part_svc_broadband_export->can('export_tower_sector')) { + $error = $part_svc_broadband_export->export_tower_sector($new); + } + } +} + # set up redirect URLs my $redirect; diff --git a/httemplate/edit/process/tower.html b/httemplate/edit/process/tower.html index e17cd55ae..ba7309c99 100644 --- a/httemplate/edit/process/tower.html +++ b/httemplate/edit/process/tower.html @@ -5,7 +5,7 @@ 'fields' => [qw( sectorname ip_addr height freq_mhz direction width downtilt v_width margin - sector_range up_rate down_rate + sector_range up_rate_limit down_rate_limit )], }, &> diff --git a/httemplate/edit/tower.html b/httemplate/edit/tower.html index 660788849..b9fea779f 100644 --- a/httemplate/edit/tower.html +++ b/httemplate/edit/tower.html @@ -12,8 +12,8 @@ 'altitude', 'height', 'veg_height', - 'up_rate', - 'down_rate', + 'up_rate_limit', + 'down_rate_limit', { field => 'sectornum', type => 'tower_sector', o2m_table => 'tower_sector', @@ -32,8 +32,8 @@ 'height' => 'Height (feet)', 'veg_height' => 'Vegetation height (feet)', 'color' => 'Color', - 'up_rate' => 'Up Rate (Kbps)', - 'down_rate' => 'Down Rate (Kbps)', + 'up_rate_limit' => 'Up Rate Limit(Kbps)', + 'down_rate_limit' => 'Down Rate Limit(Kbps)', }, &> <%init> @@ -43,7 +43,7 @@ my $m2_error_callback = sub { # reconstruct the list my @fields = qw( sectorname ip_addr height freq_mhz direction width tilt v_width margin - sector_range up_rate down_rate + sector_range up_rate_limit down_rate_limit ); map { diff --git a/httemplate/elements/tr-tower_sectors.html b/httemplate/elements/tr-tower_sectors.html index 6843f4fdc..8acedb84b 100644 --- a/httemplate/elements/tr-tower_sectors.html +++ b/httemplate/elements/tr-tower_sectors.html @@ -17,7 +17,7 @@ my $tabcounter = 0; my @fields = qw( sectorname ip_addr height freq_mhz direction width downtilt v_width db_high db_low sector_range - power line_loss antenna_gain hardware_typenum up_rate down_rate + power line_loss antenna_gain hardware_typenum up_rate_limit down_rate_limit ); my @sectors; @@ -294,16 +294,16 @@ $(function() { <p> <label><% emt('Up Rate (Kbps)') %></label> <input style="text-align: left" - id="<% $id %>_up_rate" - name="<% $id %>_up_rate" - value="<% $sector->up_rate |h %>"> + id="<% $id %>_up_rate_limit" + name="<% $id %>_up_rate_limit" + value="<% $sector->up_rate_limit |h %>"> </p> <p> <label><% emt('Down Rate (Kbps)') %></label> <input style="text-align: left" - id="<% $id %>_down_rate" - name="<% $id %>_down_rate" - value="<% $sector->down_rate |h %>"> + id="<% $id %>_down_rate_limit" + name="<% $id %>_down_rate_limit" + value="<% $sector->down_rate_limit |h %>"> </p> </div> |