sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#59797 /api/headerruleconditions (actions) fix reseller role

Browse Source 
* fix resultset when user role is reseller so that reseller_id
  is joined correctly and a db error is not produced anymore.

Change-Id: I2a1b357037d983f23770bb59519fc2cb8b68a7e4
mr12.4
Kirill Solomko 1 year ago
parent 9d598d4502
commit bf249f9d96
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File

16
lib/NGCP/Panel/Role/API/HeaderRuleActions.pm
Unescape View File

@ -26,21 +26,21 @@ sub _item_rs {
join => { rule => 'ruleset' }
});
if ($c->user->roles eq "reseller") {
$item_rs = $c->model('DB')->resultset('voip_header_rule_actions')->search_rs({
'ruleset.reseller_id' => $c->user->reseller_id,
});
if ($c->user->roles eq 'reseller') {
$item_rs = $item_rs->search_rs({ 'ruleset.reseller_id' => $c->user->reseller_id, });
}
if (my $subscriber_id = $c->req->param('subscriber_id')) {
my $prov_subscriber_id = NGCP::Panel::Utils::Subscriber::billing_to_prov_subscriber_id(
c => $c, subscriber_id => $subscriber_id
);
$item_rs = $item_rs->search_rs(
{ 'ruleset.subscriber_id' => $prov_subscriber_id });
$item_rs = $item_rs->search_rs({
'ruleset.subscriber_id' => $prov_subscriber_id
});
} else {
$item_rs = $item_rs->search_rs(
{ 'ruleset.subscriber_id' => undef });
$item_rs = $item_rs->search_rs({
'ruleset.subscriber_id' => undef
});
}
return $item_rs;

14
lib/NGCP/Panel/Role/API/HeaderRuleConditions.pm
Unescape View File

@ -27,8 +27,8 @@ sub _item_rs {
join => { rule => 'ruleset' }
});
if ($c->user->roles eq "reseller") {
$item_rs = $c->model('DB')->resultset('voip_header_rule_conditions')->search_rs({
if ($c->user->roles eq 'reseller') {
$item_rs = $item_rs->search_rs({
'ruleset.reseller_id' => $c->user->reseller_id,
});
}
@ -37,11 +37,13 @@ sub _item_rs {
my $prov_subscriber_id = NGCP::Panel::Utils::Subscriber::billing_to_prov_subscriber_id(
c => $c, subscriber_id => $subscriber_id
);
$item_rs = $item_rs->search_rs(
{ 'ruleset.subscriber_id' => $prov_subscriber_id });
$item_rs = $item_rs->search_rs({
'ruleset.subscriber_id' => $prov_subscriber_id
});
} else {
$item_rs = $item_rs->search_rs(
{ 'ruleset.subscriber_id' => undef });
$item_rs = $item_rs->search_rs({
'ruleset.subscriber_id' => undef
});
}
return $item_rs;

Write Preview
Loading…
Cancel
Save