X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Frouter.pm;h=f66f2cee885a18084fe6945df82c21d48f82c1a2;hb=573139dbd6c37808697bfa72a3a468bb0980d4dd;hp=88ba99032d2837bebb96fc1b7957ea34e7e9af9c;hpb=673b9a458d9138523026963df6fa3b4683e09bae;p=freeside.git

diff --git a/FS/FS/router.pm b/FS/FS/router.pm
index 88ba99032..f66f2cee8 100755
--- a/FS/FS/router.pm
+++ b/FS/FS/router.pm
@@ -2,10 +2,10 @@ 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 );
+@ISA = qw( FS::Record FS::m2m_Common );
 
 =head1 NAME
 
@@ -82,12 +82,47 @@ sub check {
 
   my $error =
     $self->ut_numbern('routernum')
-    || $self->ut_text('routername');
+    || $self->ut_text('routername')
+    || $self->ut_agentnum_acl('agentnum', 'Broadband global configuration')
+  ;
   return $error if $error;
 
   $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
@@ -125,9 +160,17 @@ sub part_svc {
       $self->part_svc_router;
 }
 
-=back
+=item agent
+
+Returns the agent associated with this router, if any.
+
+=cut
 
-=head1 BUGS
+sub agent {
+  qsearchs('agent', { 'agentnum' => shift->agentnum });
+}
+
+=back
 
 =head1 SEE ALSO