diff options
Diffstat (limited to 'FS')
| -rwxr-xr-x | FS/FS/addr_block.pm | 29 | ||||
| -rwxr-xr-x | FS/FS/router.pm | 37 |
2 files changed, 59 insertions, 7 deletions
diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm index 0fe2476a2..be42cb50b 100755 --- a/FS/FS/addr_block.pm +++ b/FS/FS/addr_block.pm @@ -76,14 +76,35 @@ otherwise returns false. Deletes this record from the database. If there is an error, returns the error, otherwise returns false. +=cut + sub delete { my $self = shift; - return 'Block must be deallocated before deletion' - if $self->router; - - $self->SUPER::delete; + return 'Block must be deallocated and have no services before deletion' + if $self->router || $self->svc_broadband; + + local $SIG{HUP} = 'IGNORE'; + local $SIG{INT} = 'IGNORE'; + local $SIG{QUIT} = 'IGNORE'; + local $SIG{TERM} = 'IGNORE'; + local $SIG{TSTP} = 'IGNORE'; + local $SIG{PIPE} = 'IGNORE'; + + my $oldAutoCommit = $FS::UID::AutoCommit; + local $FS::UID::AutoCommit = 0; + my $dbh = dbh; + + my $error = $self->SUPER::delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + + $dbh->commit or die $dbh->errstr if $oldAutoCommit; + ''; } + =item replace OLD_RECORD Replaces OLD_RECORD with this one in the database. If there is an error, diff --git a/FS/FS/router.pm b/FS/FS/router.pm index 7a9fda398..f66f2cee8 100755 --- a/FS/FS/router.pm +++ b/FS/FS/router.pm @@ -2,7 +2,7 @@ package FS::router; use strict; use vars qw( @ISA ); -use FS::Record qw( qsearchs qsearch ); +use FS::Record qw( qsearchs qsearch dbh ); use FS::addr_block; @ISA = qw( FS::Record FS::m2m_Common ); @@ -90,6 +90,39 @@ sub check { $self->SUPER::check; } +=item delete + +Deletes this router if and only if no address blocks (see L<FS::addr_block>) +are currently allocated to it. + +=cut + +sub delete { + my $self = shift; + + return 'Router has address blocks allocated to it' if $self->addr_block; + + local $SIG{HUP} = 'IGNORE'; + local $SIG{INT} = 'IGNORE'; + local $SIG{QUIT} = 'IGNORE'; + local $SIG{TERM} = 'IGNORE'; + local $SIG{TSTP} = 'IGNORE'; + local $SIG{PIPE} = 'IGNORE'; + + my $oldAutoCommit = $FS::UID::AutoCommit; + local $FS::UID::AutoCommit = 0; + my $dbh = dbh; + + my $error = $self->SUPER::delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + + $dbh->commit or die $dbh->errstr if $oldAutoCommit; + ''; +} + =item addr_block Returns a list of FS::addr_block objects (address blocks) associated @@ -139,8 +172,6 @@ sub agent { =back -=head1 BUGS - =head1 SEE ALSO FS::svc_broadband, FS::router, FS::addr_block, FS::part_svc, |