From a5fa8b0aa1814e6a61a36ba3913727868d0c8c13 Mon Sep 17 00:00:00 2001 From: Irina Peshinskaya Date: Tue, 20 Dec 2016 06:53:41 +0200 Subject: [PATCH] MT#3947 Fix 500 on terminated subscribers for the voicemailsettings Change-Id: I20aea2370774dc517ec92bb3f78d03dda144af1b --- lib/NGCP/Panel/Role/API/VoicemailSettings.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/NGCP/Panel/Role/API/VoicemailSettings.pm b/lib/NGCP/Panel/Role/API/VoicemailSettings.pm index d61063e7ff..6c8800650b 100644 --- a/lib/NGCP/Panel/Role/API/VoicemailSettings.pm +++ b/lib/NGCP/Panel/Role/API/VoicemailSettings.pm @@ -15,13 +15,15 @@ use NGCP::Panel::Form::Voicemail::API; sub _item_rs { my ($self, $c) = @_; - my $item_rs = $c->model('DB')->resultset('voicemail_users'); + my $item_rs = $c->model('DB')->resultset('voicemail_users')->search({ + 'voip_subscriber.status' => { '!=' => 'terminated' }, + }, { + join => { provisioning_voip_subscriber => { voip_subscriber => { contract => 'contact' } } }, + }); if($c->user->roles eq "admin") { } elsif($c->user->roles eq "reseller") { $item_rs = $item_rs->search({ - 'contact.reseller_id' => $c->user->reseller_id - }, { - join => { provisioning_voip_subscriber => { voip_subscriber => { contract => 'contact' } } }, + 'contact.reseller_id' => $c->user->reseller_id, }); } return $item_rs;