MT#8367 Remove potentially ambiguous voip_subscribers.status reference

Now DBIx uses subqueries for sequential searches so no ambiguity
is present now.
agranig/pbx-dev-map
Irka 11 years ago
parent f5fbb6347d
commit b59e7bb3df

@ -88,8 +88,8 @@ sub POST :Allow {
);
my $subscriber_rs = $c->model('DB')->resultset('voip_subscribers')->search({
id => $resource->{subscriber_id},
status => { '!=' => 'terminated' },
'me.id' => $resource->{subscriber_id},
'me.status' => { '!=' => 'terminated' },
});
if($c->user->roles eq "admin") {
} elsif($c->user->roles eq "reseller") {

@ -91,8 +91,8 @@ sub POST :Allow {
);
my $subscriber_rs = $c->model('DB')->resultset('voip_subscribers')->search({
id => $resource->{subscriber_id},
status => { '!=' => 'terminated' },
'me.id' => $resource->{subscriber_id},
'me.status' => { '!=' => 'terminated' },
});
if($c->user->roles eq "admin") {
} elsif($c->user->roles eq "reseller") {

@ -62,7 +62,7 @@ sub item_rs {
my $item_rs;
$item_rs = $c->model('DB')->resultset('voip_subscribers')
->search({ status => { '!=' => 'terminated' } },
->search({ 'me.status' => { '!=' => 'terminated' } },
{join => 'provisioning_voip_subscriber'});
if($c->user->roles eq "admin") {
} elsif($c->user->roles eq "reseller") {

@ -77,7 +77,7 @@ sub item_rs {
$item_rs = $c->model('DB')->resultset('voip_subscribers')
->search(
{ status => { '!=' => 'terminated' } },
{ 'me.status' => { '!=' => 'terminated' } },
{ prefetch => 'provisioning_voip_subscriber',},
);
if($c->user->roles eq "reseller") {

@ -85,7 +85,7 @@ sub item_rs {
$item_rs = $c->model('DB')->resultset('voip_subscribers')
->search(
{ status => { '!=' => 'terminated' } },
{ 'me.status' => { '!=' => 'terminated' } },
{ prefetch => 'provisioning_voip_subscriber',},
);
if($c->user->roles eq "reseller") {

@ -88,7 +88,7 @@ sub item_rs {
$item_rs = $c->model('DB')->resultset('voip_subscribers')
->search(
{ status => { '!=' => 'terminated' } },
{ 'me.status' => { '!=' => 'terminated' } },
{ prefetch => 'provisioning_voip_subscriber',},
);
if($c->user->roles eq "reseller") {

@ -96,7 +96,7 @@ sub update_item {
);
my $sub_rs = $c->model('DB')->resultset('voip_subscribers')->search({
id => $resource->{subscriber_id},
'me.id' => $resource->{subscriber_id},
});
if($c->user->roles eq "reseller") {
$sub_rs = $sub_rs->search({

@ -64,7 +64,7 @@ sub item_rs {
my $item_rs;
$item_rs = $c->model('DB')->resultset('voip_subscribers')
->search({ status => { '!=' => 'terminated' } });
->search({ 'me.status' => { '!=' => 'terminated' } });
if($c->user->roles eq "admin") {
} elsif($c->user->roles eq "reseller") {
$item_rs = $item_rs->search({

@ -122,8 +122,8 @@ sub subscriber_from_id {
my ($self, $c, $id) = @_;
my $sub_rs = $c->model('DB')->resultset('voip_subscribers')->search({
id => $id,
status => { '!=' => 'terminated' },
'me.id' => $id,
'me.status' => { '!=' => 'terminated' },
});
if($c->user->roles eq "admin") {
} elsif($c->user->roles eq "reseller") {

Loading…
Cancel
Save