diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2021-03-17 19:28:00 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2021-03-17 19:28:00 -0700 |
| commit | 20961c94ea06ad3aa71fad2bd7f6903f83f02ebc (patch) | |
| tree | 9273d2398131e517385631c29ebdc25263b10385 | |
| parent | fcdbe29ee89b9aaa472a11032ff937c943a867c6 (diff) | |
disable fcc 477 deployment zones, RT#85668
| -rw-r--r-- | FS/FS/Schema.pm | 1 | ||||
| -rw-r--r-- | FS/FS/deploy_zone.pm | 9 | ||||
| -rw-r--r-- | httemplate/browse/deploy_zone.html | 4 | ||||
| -rw-r--r-- | httemplate/edit/deploy_zone-fixed.html | 6 |
4 files changed, 19 insertions, 1 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 569401b1d..4ebda4e11 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -7450,6 +7450,7 @@ sub tables_hashref { 'is_business', 'char', 'NULL', 1, '', '', 'active_date', @date_type, '', '', 'expire_date', @date_type, '', '', + 'disabled', 'char', 'NULL', 1, '', '', ], 'primary_key' => 'zonenum', 'unique' => [], diff --git a/FS/FS/deploy_zone.pm b/FS/FS/deploy_zone.pm index 306b4fb44..723b491c8 100644 --- a/FS/FS/deploy_zone.pm +++ b/FS/FS/deploy_zone.pm @@ -187,8 +187,15 @@ returns the error, otherwise returns false. =cut -# the replace method can be inherited from FS::Record +sub replace { + my $self = shift; + my $old = shift || $self->replace_old; + + $self->expire_date(time) + if $self->disabled eq 'Y' && ! $old->disabled && ! $self->expire_date; + $self->SUPER::replace($old, @_); +} =item check Checks all fields to make sure this is a valid zone record. If there is diff --git a/httemplate/browse/deploy_zone.html b/httemplate/browse/deploy_zone.html index a1bd57f15..5514d7db8 100644 --- a/httemplate/browse/deploy_zone.html +++ b/httemplate/browse/deploy_zone.html @@ -61,6 +61,8 @@ nohtmlheader => 1, disable_maxselect => 1, disable_total => 1, + disableable => 1, + disabled_statuspos => 2, &> <P><FONT SIZE="+1"><B>Mobile Zones</B></FONT></P> <& elements/browse.html, @@ -112,6 +114,8 @@ nohtmlheader => 1, disable_maxselect => 1, disable_total => 1, + disableable => 1, + disabled_statuspos => 2, &> <& /elements/footer.html &> diff --git a/httemplate/edit/deploy_zone-fixed.html b/httemplate/edit/deploy_zone-fixed.html index 24e03b01a..ce98c46e8 100644 --- a/httemplate/edit/deploy_zone-fixed.html +++ b/httemplate/edit/deploy_zone-fixed.html @@ -4,6 +4,7 @@ 'post_url' => popurl(1).'process/deploy_zone-fixed.html', 'viewall_dir' => 'browse', 'labels' => { + 'zonenum' => 'Deployment zone', 'description' => 'Description', 'agentnum' => 'Agent', 'dbaname' => 'Business name (if different from agent)', @@ -14,6 +15,7 @@ 'cir_speed_down' => 'Downstream', 'is_consumer' => 'Consumer/mass market', 'is_business' => 'Business/government', + 'disabled' => 'Disabled', 'blocknum' => '', 'active_date' => 'Active since', 'file' => 'Import blocks from text file', @@ -37,6 +39,9 @@ $cgi->param('active_date') || $object->active_date || time; }, }, + { field => 'expire_date', + type => 'hidden', + }, { field => 'agentnum', type => 'select-agent', disable_empty => 1, @@ -50,6 +55,7 @@ }, { field => 'is_consumer', type => 'checkbox', value=>'Y' }, { field => 'is_business', type => 'checkbox', value=>'Y' }, + { field => 'disabled', type=>'checkbox', value=>'Y', }, { type => 'tablebreak-tr-title', value => 'Advertised maximum speed (Mbps)' }, 'adv_speed_down', |