TT#23955 Consider form_exceptions in the Entities GET

Change-Id: Id407f7af9e9696d76b16e602b2c0d50818c99a45
changes/55/16555/4
Irina Peshinskaya 8 years ago
parent 355c060be8
commit 7709f541bf

@ -738,6 +738,8 @@ sub process_hal_resource {
my($self, $c, $item, $resource, $form) = @_;
my $schema = $c->model('DB');
# todo: mashal specific fields, per conversation event type ...
$c->log->debug(Dumper('item'));
$c->log->debug(Dumper($item));
my ($item_mock_obj, $item_accessors_hash) = _get_item_object($c, $item);
if('call' eq $item->{type}){
my $cdr_subscriber_id = $c->model('DB')->resultset('voip_subscribers')->search_rs({
@ -754,6 +756,7 @@ sub process_hal_resource {
$owner,
);
@{$resource}{qw/caller callee/} = @{$resource}{qw/own_cli other_cli/};
$resource->{type} = $item->{type};
}elsif('fax' eq $item->{type}){
my $fax_subscriber = $c->model('DB')->resultset('provisioning_voip_subscribers')->search_rs({
'id' => $item_mock_obj->subscriber_id,

@ -58,10 +58,10 @@ sub get {
return unless $items;
(my $total_count, $items) = $self->paginate_order_collection($c, $items);
my (@embedded, @links);
my ($form) = $self->get_form($c);
my ($form, $form_exceptions) = $self->get_form($c);
my @items = 'ARRAY' eq ref $items ? @$items : $items->all;
for my $item (@items) {
push @embedded, $self->hal_from_item($c, $item, $form);
push @embedded, $self->hal_from_item($c, $item, $form, { form_exceptions => $form_exceptions });
push @links, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,
href => sprintf('/%s%s', $c->request->path, $self->get_item_id($c,

Loading…
Cancel
Save