From 4ea66d61776319069a1896d404beb9acaaf374cb Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Mon, 23 Sep 2019 15:08:27 +0200 Subject: [PATCH] TT#67210 Align deviceid alias name to db column Change-Id: I98bb49b55cce0ade5994fa18c23a2ece4951e42a --- lib/NGCP/Panel/Controller/API/PbxDevices.pm | 4 ++-- lib/NGCP/Panel/Role/API/PbxDevices.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/NGCP/Panel/Controller/API/PbxDevices.pm b/lib/NGCP/Panel/Controller/API/PbxDevices.pm index ee0188b227..55e716402d 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDevices.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDevices.pm @@ -201,9 +201,9 @@ sub POST :Allow { $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'deviceid_number_id'. Number is not a device id."); return; } - $line->{deviceid_alias_id} = $devid_num->voip_dbalias->id; + $line->{deviceid_dbalias_id} = $devid_num->voip_dbalias->id; } else { - $line->{deviceid_alias_id} = undef; + $line->{deviceid_dbalias_id} = undef; } delete $line->{deviceid_number_id}; diff --git a/lib/NGCP/Panel/Role/API/PbxDevices.pm b/lib/NGCP/Panel/Role/API/PbxDevices.pm index 8094e4e33e..b51a558914 100644 --- a/lib/NGCP/Panel/Role/API/PbxDevices.pm +++ b/lib/NGCP/Panel/Role/API/PbxDevices.pm @@ -54,7 +54,7 @@ sub resource_from_item { my $p_subs = $line->provisioning_voip_subscriber; my $b_subs = $p_subs ? $p_subs->voip_subscriber : undef; my $line_attr = { $line->get_inflated_columns }; - foreach my $f(qw/id device_id linerange_id deviceid_alias_id/) { + foreach my $f(qw/id device_id linerange_id deviceid_dbalias_id/) { delete $line_attr->{$f}; } foreach my $f(qw/key_num/) { @@ -194,9 +194,9 @@ sub update_item { $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'deviceid_number_id'. Number is not a device id."); return; } - $line->{deviceid_alias_id} = $devid_num->voip_dbalias->id; + $line->{deviceid_dbalias_id} = $devid_num->voip_dbalias->id; } else { - $line->{deviceid_alias_id} = undef; + $line->{deviceid_dbalias_id} = undef; } delete $line->{deviceid_number_id};