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

TT#40503 Remove explicit role checking for journal links

Browse Source 
Change-Id: Id33dc65590d87f15fa565d4a400bd059f6bd9654
changes/28/23228/4
Irina Peshinskaya 7 years ago
parent 200ffa1970
commit c76d300f7d
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File

3
lib/NGCP/Panel/Role/API.pm
Unescape View File

@ -1073,7 +1073,6 @@ sub hal_from_item {
$resource //= $self->resource_from_item($c, $item, $form, $params); $resource //= $self->resource_from_item($c, $item, $form, $params);
$resource = $self->process_hal_resource($c, $item, $resource, $form, $params); $resource = $self->process_hal_resource($c, $item, $resource, $form, $params);
return unless $resource; return unless $resource;
my $adm = $c->user->roles eq "admin" || $c->user->roles eq "reseller";
my $links = $self->hal_links($c, $item, $resource, $form, $params) // []; my $links = $self->hal_links($c, $item, $resource, $form, $params) // [];
my $hal = Data::HAL->new( my $hal = Data::HAL->new(
links => [ links => [
@ -1107,7 +1106,7 @@ sub hal_from_item {
), $item, $resource, $params) ), $item, $resource, $params)
), ),
@$links, @$links,
$adm ? $self->get_journal_relation_link($c, $self->get_item_id($c, $item)) : (), $self->get_journal_relation_link($c, $self->get_item_id($c, $item)),
], ],
relation => 'ngcp:'.$self->resource_name, relation => 'ngcp:'.$self->resource_name,
); );

2
lib/NGCP/Panel/Role/API/CFBNumberSets.pm
Unescape View File

@ -32,10 +32,8 @@ sub get_form {
sub hal_links{ sub hal_links{
my($self, $c, $item, $resource, $form) = @_; my($self, $c, $item, $resource, $form) = @_;
my $adm = $c->user->roles eq "admin" || $c->user->roles eq "reseller";
return [ return [
Data::HAL::Link->new(relation => "ngcp:subscribers", href => sprintf("/api/subscribers/%d", $resource->{subscriber_id})), Data::HAL::Link->new(relation => "ngcp:subscribers", href => sprintf("/api/subscribers/%d", $resource->{subscriber_id})),
$adm ? $self->get_journal_relation_link($c, $item->id) : (),
]; ];
} }

3
lib/NGCP/Panel/Role/API/CFDestinationSets.pm
Unescape View File

@ -48,7 +48,6 @@ sub hal_from_item {
my $b_subs_id = $item->subscriber->voip_subscriber->id; my $b_subs_id = $item->subscriber->voip_subscriber->id;
$resource{subscriber_id} = $b_subs_id; $resource{subscriber_id} = $b_subs_id;
my $adm = $c->user->roles eq "admin" || $c->user->roles eq "reseller";
my $hal = Data::HAL->new( my $hal = Data::HAL->new(
links => [ links => [
@ -62,7 +61,7 @@ sub hal_from_item {
Data::HAL::Link->new(relation => 'profile', href => 'http://purl.org/sipwise/ngcp-api/'), Data::HAL::Link->new(relation => 'profile', href => 'http://purl.org/sipwise/ngcp-api/'),
Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->id)), Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->id)),
Data::HAL::Link->new(relation => "ngcp:subscribers", href => sprintf("/api/subscribers/%d", $b_subs_id)), Data::HAL::Link->new(relation => "ngcp:subscribers", href => sprintf("/api/subscribers/%d", $b_subs_id)),
$adm ? $self->get_journal_relation_link($c, $item->id) : (), $self->get_journal_relation_link($c, $item->id),
], ],
relation => 'ngcp:'.$self->resource_name, relation => 'ngcp:'.$self->resource_name,
); );

3
lib/NGCP/Panel/Role/API/CFSourceSets.pm
Unescape View File

@ -40,7 +40,6 @@ sub hal_from_item {
my $b_subs_id = $item->subscriber->voip_subscriber->id; my $b_subs_id = $item->subscriber->voip_subscriber->id;
$resource{subscriber_id} = $b_subs_id; $resource{subscriber_id} = $b_subs_id;
my $adm = $c->user->roles eq "admin" || $c->user->roles eq "reseller";
my $hal = Data::HAL->new( my $hal = Data::HAL->new(
links => [ links => [
@ -54,7 +53,7 @@ sub hal_from_item {
Data::HAL::Link->new(relation => 'profile', href => 'http://purl.org/sipwise/ngcp-api/'), Data::HAL::Link->new(relation => 'profile', href => 'http://purl.org/sipwise/ngcp-api/'),
Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->id)), Data::HAL::Link->new(relation => 'self', href => sprintf("%s%d", $self->dispatch_path, $item->id)),
Data::HAL::Link->new(relation => "ngcp:subscribers", href => sprintf("/api/subscribers/%d", $b_subs_id)), Data::HAL::Link->new(relation => "ngcp:subscribers", href => sprintf("/api/subscribers/%d", $b_subs_id)),
$adm ? $self->get_journal_relation_link($c, $item->id) : (), $self->get_journal_relation_link($c, $item->id),
], ],
relation => 'ngcp:'.$self->resource_name, relation => 'ngcp:'.$self->resource_name,
); );

Write Preview
Loading…
Cancel
Save