X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_pbx.pm;h=6ae04189c8488983ae8fcc4eaa831fc807d7607c;hp=49509b5ef7c39aafa5d91b49544baeff9666e4bb;hb=ad7f49821d40ffd099a45acc32ba91e0e211aede;hpb=9ad4f8407cc106ef5815e65bce2ee873cd0896c2 diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm index 49509b5ef..6ae04189c 100644 --- a/FS/FS/svc_pbx.pm +++ b/FS/FS/svc_pbx.pm @@ -2,8 +2,10 @@ package FS::svc_pbx; use strict; use base qw( FS::svc_External_Common ); -#use FS::Record qw( qsearch qsearchs ); +use FS::Record qw( qsearch qsearchs dbh ); use FS::cust_svc; +use FS::svc_phone; +use FS::svc_acct; =head1 NAME @@ -80,8 +82,8 @@ sub table_info { 'display_weight' => 70, 'cancel_weight' => 90, 'fields' => { - 'id' => 'Thirdlane ID', - 'title' => 'Description', + 'id' => 'ID', + 'title' => 'Name', 'max_extensions' => 'Maximum number of User Extensions', # 'field' => 'Description', # 'another_field' => { @@ -120,13 +122,13 @@ Class method which returns an SQL fragment to search for the given string. =item label -Returns a meaningful identifier for this PBX tenant. +Returns the title field for this PBX tenant. =cut sub label { my $self = shift; - $self->label_field; #or something more complicated if necessary + $self->title; } =item insert @@ -157,11 +159,42 @@ Delete this record from the database. sub delete { my $self = shift; - my $error; - - $error = $self->SUPER::delete; - return $error if $error; + 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; + + foreach my $svc_phone (qsearch('svc_phone', { 'pbxsvc' => $self->svcnum } )) { + $svc_phone->pbxsvc(''); + my $error = $svc_phone->replace; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + } + + foreach my $svc_acct (qsearch('svc_acct', { 'pbxsvc' => $self->svcnum } )) { + my $error = $svc_acct->delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + } + + my $error = $self->SUPER::delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + + $dbh->commit or die $dbh->errstr if $oldAutoCommit; ''; } @@ -214,6 +247,21 @@ sub check { $self->SUPER::check; } +#XXX this is a way-too simplistic implementation +# at the very least, title should be unique across exports that need that or +# controlled by a conf setting or something +sub _check_duplicate { + my $self = shift; + + $self->lock_table; + + if ( qsearchs( 'svc_pbx', { 'title' => $self->title } ) ) { + return "Name in use"; + } else { + return ''; + } +} + =back =head1 BUGS