diff options
| -rwxr-xr-x | FS/FS/router.pm | 2 | ||||
| -rwxr-xr-x | httemplate/edit/process/svc_acct.cgi | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/FS/FS/router.pm b/FS/FS/router.pm index 21011e7d7..4011bb097 100755 --- a/FS/FS/router.pm +++ b/FS/FS/router.pm @@ -114,7 +114,7 @@ sub replace { my $error = $self->SUPER::replace($old, @_); return $error if $error; - if ( defined($self->blocknum) ) { + if ( length($self->blocknum) ) { #warn "FS::router::replace: blocknum = ".$self->blocknum."\n"; # then release any blocks we're already holding foreach my $block ($self->addr_block) { diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi index ca614cbd8..9cac2c568 100755 --- a/httemplate/edit/process/svc_acct.cgi +++ b/httemplate/edit/process/svc_acct.cgi @@ -102,10 +102,14 @@ if ( ! $error ) { map { $_ => $cgi->param("router_$_") } qw( routernum routername blocknum ) }); - if (length($router->routername == 0)) { + if (length($router->routername) == 0) { #sensible default $router->set('routername', $new->label); } + if (length($router->blocknum) == 0) { + #unset it + $router->set('blocknum', 0); + } push @child_objects, $router; } |