diff --git a/lib/NGCP/Panel/Role/API.pm b/lib/NGCP/Panel/Role/API.pm index 708af2f2a8..015dbc5d0d 100644 --- a/lib/NGCP/Panel/Role/API.pm +++ b/lib/NGCP/Panel/Role/API.pm @@ -1073,7 +1073,6 @@ sub hal_from_item { $resource //= $self->resource_from_item($c, $item, $form, $params); $resource = $self->process_hal_resource($c, $item, $resource, $form, $params); 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 $hal = Data::HAL->new( links => [ @@ -1107,7 +1106,7 @@ sub hal_from_item { ), $item, $resource, $params) ), @$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, ); diff --git a/lib/NGCP/Panel/Role/API/CFBNumberSets.pm b/lib/NGCP/Panel/Role/API/CFBNumberSets.pm index dcd907e328..e9ba5612d8 100644 --- a/lib/NGCP/Panel/Role/API/CFBNumberSets.pm +++ b/lib/NGCP/Panel/Role/API/CFBNumberSets.pm @@ -32,10 +32,8 @@ sub get_form { sub hal_links{ my($self, $c, $item, $resource, $form) = @_; - my $adm = $c->user->roles eq "admin" || $c->user->roles eq "reseller"; return [ - Data::HAL::Link->new(relation => "ngcp:subscribers", href => sprintf("/api/subscribers/%d", $resource->{subscriber_id})), - $adm ? $self->get_journal_relation_link($c, $item->id) : (), + Data::HAL::Link->new(relation => "ngcp:subscribers", href => sprintf("/api/subscribers/%d", $resource->{subscriber_id})), ]; } diff --git a/lib/NGCP/Panel/Role/API/CFDestinationSets.pm b/lib/NGCP/Panel/Role/API/CFDestinationSets.pm index f3be85c56a..c182362292 100644 --- a/lib/NGCP/Panel/Role/API/CFDestinationSets.pm +++ b/lib/NGCP/Panel/Role/API/CFDestinationSets.pm @@ -48,7 +48,6 @@ sub hal_from_item { my $b_subs_id = $item->subscriber->voip_subscriber->id; $resource{subscriber_id} = $b_subs_id; - my $adm = $c->user->roles eq "admin" || $c->user->roles eq "reseller"; my $hal = Data::HAL->new( 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 => '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)), - $adm ? $self->get_journal_relation_link($c, $item->id) : (), + $self->get_journal_relation_link($c, $item->id), ], relation => 'ngcp:'.$self->resource_name, ); diff --git a/lib/NGCP/Panel/Role/API/CFSourceSets.pm b/lib/NGCP/Panel/Role/API/CFSourceSets.pm index 4e91171dce..c178dc2b49 100644 --- a/lib/NGCP/Panel/Role/API/CFSourceSets.pm +++ b/lib/NGCP/Panel/Role/API/CFSourceSets.pm @@ -40,7 +40,6 @@ sub hal_from_item { my $b_subs_id = $item->subscriber->voip_subscriber->id; $resource{subscriber_id} = $b_subs_id; - my $adm = $c->user->roles eq "admin" || $c->user->roles eq "reseller"; my $hal = Data::HAL->new( 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 => '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)), - $adm ? $self->get_journal_relation_link($c, $item->id) : (), + $self->get_journal_relation_link($c, $item->id), ], relation => 'ngcp:'.$self->resource_name, );