MT#7717 explicitly delete related tables of voip_domains

to ensure trigger execution on them
gjungwirth/voicemail_number
Gerhard Jungwirth 11 years ago
parent c5fd0122a6
commit b0a7f8f2b2

@ -100,7 +100,13 @@ sub DELETE :Allow {
}
}
$domain->provisioning_voip_domain->delete;
my $prov_domain = $domain->provisioning_voip_domain;
if ($prov_domain) {
$prov_domain->voip_dbaliases->delete;
$prov_domain->voip_dom_preferences->delete;
$prov_domain->provisioning_voip_subscribers->delete;
$prov_domain->delete;
}
$domain->delete;
try {

@ -229,10 +229,14 @@ sub delete :Chained('base') :PathPart('delete') :Args(0) {
my ($self, $c) = @_;
my $domain = $c->stash->{'domain_result'}->domain;
my $prov_domain = $c->stash->{'provisioning_domain_result'};
try {
$c->model('DB')->schema->txn_do( sub {
$c->stash->{'domain_result'}->delete;
$c->stash->{'provisioning_domain_result'}->delete;
$prov_domain->voip_dbaliases->delete;
$prov_domain->voip_dom_preferences->delete;
$prov_domain->provisioning_voip_subscribers->delete;
$prov_domain->delete;
NGCP::Panel::Utils::Prosody::deactivate_domain($c, $domain)
unless($c->config->{features}->{debug});
});

@ -146,7 +146,12 @@ sub recursively_lock_contract {
# remove domains in case of reseller termination
for my $domain($reseller->domain_resellers->all) {
my $prov_domain = $domain->domain->provisioning_voip_domain;
$prov_domain->delete if $prov_domain;
if ($prov_domain) {
$prov_domain->voip_dbaliases->delete;
$prov_domain->voip_dom_preferences->delete;
$prov_domain->provisioning_voip_subscribers->delete;
$prov_domain->delete;
}
$domain->domain->delete;
$domain->delete;
}

Loading…
Cancel
Save