TT#62866 find created reg. if domain is NULL

Change-Id: I6cf1387fd290ca1b8f3f8d27e7b5b1c3cb6150d3
(cherry picked from commit 78f0bfa232)
(cherry picked from commit 3e3210e80f)
changes/99/34799/1
Rene Krenn 6 years ago
parent ab1f057f3f
commit 1d8d779af2

@ -44,13 +44,13 @@ sub _item_rs {
$item_rs = $c->model('DB')->resultset('location');
if($c->user->roles eq "admin") {
$item_rs = $item_rs->search({
},{
join => [@joins,'subscriber'],
});
} elsif($c->user->roles eq "reseller") {
$item_rs = $item_rs->search({
'contact.reseller_id' => $c->user->reseller_id
$item_rs = $item_rs->search({
'contact.reseller_id' => $c->user->reseller_id
},{
join => [@joins, { 'subscriber' => { 'voip_subscriber' => { 'contract' => 'contact' }}} ],
});
@ -122,7 +122,7 @@ sub resource_from_item {
sub item_by_id {
my ($self, $c, $id) = @_;
my $item_rs = $self->item_rs($c);
return $item_rs->find($id);
}
@ -178,7 +178,10 @@ sub _item_by_aor {
return $self->item_rs($c)->search({
'me.contact' => $contact,
'me.username' => $sub->provisioning_voip_subscriber->username,
'me.domain' => $sub->provisioning_voip_subscriber->domain->domain,
'-or' => [
'me.domain' => $sub->provisioning_voip_subscriber->domain->domain,
'me.domain' => undef,
],
})->first;
}
@ -206,7 +209,7 @@ sub update_item {
$values->{flags} = 0;
$values->{cflags} = 0;
$values->{cflags} |= 64 if($values->{nat});
NGCP::Panel::Utils::Kamailio::create_location($c,
$sub->provisioning_voip_subscriber,
$values

Loading…
Cancel
Save