TT#16675 fix duplicate rows for Calllist representations

Change-Id: I3d492dd342f92c0193b64db63b792db92839f2a4
changes/50/17350/3
Kirill Solomko 8 years ago
parent b08b742fd5
commit b0ab2317e4

@ -45,6 +45,7 @@ sub query_params {
}),NGCP::Panel::Utils::CallList::SUPPRESS_OUT);
my $in_rs = NGCP::Panel::Utils::CallList::call_list_suppressions_rs($c,$rs->search_rs({
destination_user_id => $subscriber->uuid,
source_user_id => { '!=' => $subscriber->uuid },
}),NGCP::Panel::Utils::CallList::SUPPRESS_IN);
return $out_rs->union_all($in_rs);
}

@ -53,6 +53,7 @@ sub query_params {
});
my $in_rs = $rs->search_rs({
destination_user_id => $subscriber->uuid,
source_user_id => { '!=' => $subscriber->uuid },
});
return $out_rs->union_all($in_rs);
}

@ -3551,6 +3551,7 @@ sub ajax_calls :Chained('calllist_master') :PathPart('list/ajax') :Args(0) {
}),NGCP::Panel::Utils::CallList::SUPPRESS_OUT);
my $in_rs = NGCP::Panel::Utils::CallList::call_list_suppressions_rs($c,$c->model('DB')->resultset('cdr')->search({
destination_user_id => $c->stash->{subscriber}->uuid,
source_user_id => { '!=' => $c->stash->{subscriber}->uuid },
($callid ? (call_id => $callid) : ()),
}),NGCP::Panel::Utils::CallList::SUPPRESS_IN);
my $rs = $out_rs->union_all($in_rs);

@ -46,6 +46,7 @@ sub _item_rs {
}),NGCP::Panel::Utils::CallList::SUPPRESS_OUT);
my $in_rs = NGCP::Panel::Utils::CallList::call_list_suppressions_rs($c,$item_rs->search_rs({
destination_user_id => $c->user->voip_subscriber->uuid,
source_user_id => { '!=' => $c->user->voip_subscriber->uuid },
}),NGCP::Panel::Utils::CallList::SUPPRESS_IN);
$item_rs = $out_rs->union_all($in_rs);
}

Loading…
Cancel
Save