X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Frouter.pm;h=45d9f2b2d2a28ccc17f04f12ec79a2cb6266120f;hb=a111293b6aa333fdfe727df17eaf4a66ba9c6672;hp=937dc1f45825cd423b6e1ea693b7d3b0a8a7a8e4;hpb=f1a024ad18faf7246176f7679f0443e0377785b6;p=freeside.git diff --git a/FS/FS/router.pm b/FS/FS/router.pm index 937dc1f45..45d9f2b2d 100755 --- a/FS/FS/router.pm +++ b/FS/FS/router.pm @@ -116,7 +116,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) { @@ -202,6 +202,13 @@ sub delete { Returns a list of FS::addr_block objects (address blocks) associated with this object. +=cut + +sub addr_block { + my $self = shift; + qsearch('addr_block', { routernum => $self->routernum }); +} + =item auto_addr_block Returns a list of address blocks on which auto-assignment of IP addresses @@ -209,11 +216,6 @@ is enabled. =cut -sub addr_block { - my $self = shift; - return qsearch('addr_block', { routernum => $self->routernum }); -} - sub auto_addr_block { my $self = shift; return () if $self->manual_addr;