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

Use roles instead of realm for logged in users.

Browse Source
agranig/peering-route
Andreas Granig 13 years ago
parent fc8c9e2df8
commit 086d91ff0e
20 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

8
lib/NGCP/Panel/Controller/Subscriber.pm
Unescape View File

@ -69,13 +69,13 @@ sub sub_list :Chained('/') :PathPart('subscriber') :CaptureArgs(0) {
$c->stash->{subscribers_rs} = $c->model('DB')->resultset('voip_subscribers')->search({
'me.status' => { '!=' => 'terminated' },
});
if($c->user_in_realm('reseller')) {
if($c->user->roles eq 'reseller') {
$c->stash->{subscribers_rs} = $c->stash->{subscribers_rs}->search({
'contact.reseller_id' => $c->user->reseller_id,
},{
join => { 'contract' => 'contact'},
});
} elsif($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) {
} elsif($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') {
$c->stash->{subscribers_rs} = $c->stash->{subscribers_rs}->search({
'username' => $c->user->username
},{
@ -380,7 +380,7 @@ sub preferences_base :Chained('base') :PathPart('preferences') :CaptureArgs(1) {
$c->stash->{preference_meta} = $c->model('DB')
->resultset('voip_preferences')
->single({id => $pref_id});
if(($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) &&
if(($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') &&
!$c->stash->{preference_meta}->expose_to_customer) {
$c->log->error("invalid access to pref_id '$pref_id' by provisioning subscriber id '".$c->user->id."'");
@ -1489,7 +1489,7 @@ sub load_preference_list :Private {
NGCP::Panel::Utils::Preferences::load_preference_list( c => $c,
pref_values => \%pref_values,
usr_pref => 1,
customer_view => (($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) ? 1 : 0)
customer_view => (($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') ? 1 : 0)
);
}

4
lib/NGCP/Panel/Form/Preferences.pm
Unescape View File

@ -25,8 +25,8 @@ has_block 'fields' => (
sub field_list {
my $self = shift;
my $is_subscriber = ($self->ctx->user_in_realm('subscriber') ||
$self->ctx->user_in_realm('subscriberadmin'));
my $is_subscriber = ($self->ctx->user->roles eq 'subscriber' ||
$self->ctx->user->roles eq 'subscriberadmin');
my @field_list;
my $fields_data = $self->fields_data;

2
lib/NGCP/Panel/Widget/Plugin/AdminBillingOverview.pm
Unescape View File

@ -63,7 +63,7 @@ sub filter {
return $self if(
$type eq $self->type &&
$c->user_in_realm('admin') &&
$c->user->roles eq 'admin' &&
ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
);
return;

2
lib/NGCP/Panel/Widget/Plugin/AdminPeeringOverview.pm
Unescape View File

@ -40,7 +40,7 @@ sub filter {
return $self if(
$type eq $self->type &&
$c->user_in_realm('admin') &&
$c->user->roles eq 'admin' &&
ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
);
return;

2
lib/NGCP/Panel/Widget/Plugin/AdminResellerOverview.pm
Unescape View File

@ -45,7 +45,7 @@ sub filter {
return $self if(
$type eq $self->type &&
$c->user_in_realm('admin') &&
$c->user->roles eq 'admin' &&
ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
);
return;

2
lib/NGCP/Panel/Widget/Plugin/AdminSystemOverview.pm
Unescape View File

@ -31,7 +31,7 @@ sub filter {
return $self if(
$type eq $self->type &&
$c->user_in_realm('admin') &&
$c->user->roles eq 'admin' &&
ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
);
return;

2
lib/NGCP/Panel/Widget/Plugin/AdminTopMenuSettings.pm
Unescape View File

@ -23,7 +23,7 @@ sub filter {
return $self if(
$type eq $self->type &&
$c->user_in_realm('admin')
$c->user->roles eq 'admin'
);
return;
}

2
lib/NGCP/Panel/Widget/Plugin/ResellerBillingOverview.pm
Unescape View File

@ -56,7 +56,7 @@ sub filter {
return $self if(
$type eq $self->type &&
$c->user_in_realm('reseller') &&
$c->user->roles eq 'reseller' &&
ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
);
return;

2
lib/NGCP/Panel/Widget/Plugin/ResellerCustomerOverview.pm
Unescape View File

@ -50,7 +50,7 @@ sub filter {
return $self if(
$type eq $self->type &&
$c->user_in_realm('reseller') &&
$c->user->roles eq 'reseller' &&
ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
);
return;

2
lib/NGCP/Panel/Widget/Plugin/ResellerDomainOverview.pm
Unescape View File

@ -37,7 +37,7 @@ sub filter {
return $self if(
$type eq $self->type &&
$c->user_in_realm('reseller') &&
$c->user->roles eq 'reseller' &&
ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
);
return;

2
lib/NGCP/Panel/Widget/Plugin/ResellerTopMenuSettings.pm
Unescape View File

@ -23,7 +23,7 @@ sub filter {
return $self if(
$type eq $self->type &&
$c->user_in_realm('reseller')
$c->user->roles eq 'reseller'
);
return;
}

2
lib/NGCP/Panel/Widget/Plugin/SubscriberAdminTopMenuSettings.pm
Unescape View File

@ -23,7 +23,7 @@ sub filter {
return $self if(
$type eq $self->type &&
$c->user_in_realm('subscriberadmin')
$c->user->roles eq 'subscriberadmin'
);
return;
}

2
lib/NGCP/Panel/Widget/Plugin/SubscriberCFOverview.pm
Unescape View File

@ -56,7 +56,7 @@ sub filter {
return $self if(
$type eq $self->type &&
($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) &&
($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') &&
ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
);
return;

2
lib/NGCP/Panel/Widget/Plugin/SubscriberCallsOverview.pm
Unescape View File

@ -43,7 +43,7 @@ sub filter {
return $self if(
$type eq $self->type &&
($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) &&
($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') &&
ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
);
return;

2
lib/NGCP/Panel/Widget/Plugin/SubscriberRegisterOverview.pm
Unescape View File

@ -45,7 +45,7 @@ sub filter {
return $self if(
$type eq $self->type &&
($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) &&
($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') &&
ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
);
return;

2
lib/NGCP/Panel/Widget/Plugin/SubscriberTopMenuSettings.pm
Unescape View File

@ -23,7 +23,7 @@ sub filter {
return $self if(
$type eq $self->type &&
$c->user_in_realm('subscriber')
$c->user->roles eq 'subscriber'
);
return;
}

2
lib/NGCP/Panel/Widget/Plugin/SubscriberVmOverview.pm
Unescape View File

@ -45,7 +45,7 @@ sub filter {
return $self if(
$type eq $self->type &&
($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) &&
($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') &&
ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
);
return;

2
share/layout/body.tt
Unescape View File

@ -11,7 +11,7 @@
<ul class="pull-right">
<li>
<i class="icon-user"></i> Logged in as
[% IF c.user_in_realm('admin') || c.user_in_realm('reseller') -%]
[% IF c.user.roles == 'admin' || c.user.roles == 'reseller' -%]
[% c.user.login %]
[% ELSE -%]
[% c.user.webusername %]@[% c.user.domain.domain %]

4
share/templates/helpers/pref_table.tt
Unescape View File

@ -33,7 +33,7 @@
<tr>
[% # one for description -%]
<th></th>
[% UNLESS c.user_in_realm('subscriber') || c.user_in_realm('subscriberadmin') -%]
[% UNLESS c.user.roles == 'subscriber' || c.user.roles == 'subscriberadmin' -%]
<th>Attribute</th>
[% END -%]
<th>Name</th>
@ -56,7 +56,7 @@
]
}); return false;"><i class="icon-question-sign"></i></a>
</td>
[% UNLESS c.user_in_realm('subscriber') || c.user_in_realm('subscriberadmin') -%]
[% UNLESS c.user.roles == 'subscriber' || c.user.roles == 'subscriberadmin' -%]
<td>[% r.attribute %]</td>
[% END -%]
<td>

2
share/templates/subscriber/preferences.tt
Unescape View File

@ -365,7 +365,7 @@
</div>
</div>
[% UNLESS c.user_in_realm('subscriber') || c.user_in_realm('subscriberadmin') -%]
[% UNLESS c.user.roles == 'subscriber' || c.user.roles == 'subscriberadmin' -%]
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#preference_groups" href="#collapse_ts">Trusted Sources</a>

Write Preview
Loading…
Cancel
Save