From e0ee27d2bb77d5f6cfa4f8748e66fb6fd51d6bac Mon Sep 17 00:00:00 2001 From: Irina Peshinskaya Date: Wed, 21 Nov 2018 22:56:54 +0100 Subject: [PATCH] TT#47569 Rename soundset override parameter to replace_existing Change-Id: I9d7ddb0592e4631fe1cf38ea8554f17284d6b331 --- lib/NGCP/Panel/Controller/API/SoundSets.pm | 4 ++-- lib/NGCP/Panel/Controller/Sound.pm | 2 +- lib/NGCP/Panel/Form/Sound/AdminSetAPI.pm | 2 +- lib/NGCP/Panel/Form/Sound/LoadDefault.pm | 2 +- lib/NGCP/Panel/Form/Sound/LoadDefaultBase.pm | 2 +- lib/NGCP/Panel/Form/Sound/ResellerSetAPI.pm | 2 +- lib/NGCP/Panel/Form/Sound/SubadminSetAPI.pm | 2 +- lib/NGCP/Panel/Role/API/SoundSets.pm | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/NGCP/Panel/Controller/API/SoundSets.pm b/lib/NGCP/Panel/Controller/API/SoundSets.pm index 880a972402..21a6a78129 100644 --- a/lib/NGCP/Panel/Controller/API/SoundSets.pm +++ b/lib/NGCP/Panel/Controller/API/SoundSets.pm @@ -174,7 +174,7 @@ sub POST :Allow { my $item; try { - my $copy_from_default_params = { map {$_ => delete $resource->{$_}} (qw/copy_from_default loopplay override language/)}; + my $copy_from_default_params = { map {$_ => delete $resource->{$_}} (qw/copy_from_default loopplay replace_existing language/)}; $item = $c->model('DB')->resultset('voip_sound_sets')->create($resource); if($item->contract_id && $item->contract_default) { @@ -194,7 +194,7 @@ sub POST :Allow { set_id => $item->id, handles_rs => $handles_rs, loopplay => $copy_from_default_params->{loopplay}, - override => $copy_from_default_params->{override}, + override => $copy_from_default_params->{replace_existing}, error_ref => \$error, ); } diff --git a/lib/NGCP/Panel/Controller/Sound.pm b/lib/NGCP/Panel/Controller/Sound.pm index 21da2fe62f..81e62f12fa 100644 --- a/lib/NGCP/Panel/Controller/Sound.pm +++ b/lib/NGCP/Panel/Controller/Sound.pm @@ -692,7 +692,7 @@ sub handles_load_default :Chained('handles_list') :PathPart('loaddefault') :Args set_id => $c->stash->{set_result}->id, handles_rs => $c->stash->{handles_rs}, loopplay => $form->params->{loopplay}, - override => $form->params->{override}, + override => $form->params->{replace_existing}, error_ref => \$error, ); }); diff --git a/lib/NGCP/Panel/Form/Sound/AdminSetAPI.pm b/lib/NGCP/Panel/Form/Sound/AdminSetAPI.pm index 3a0984b7af..f2d421bb1a 100644 --- a/lib/NGCP/Panel/Form/Sound/AdminSetAPI.pm +++ b/lib/NGCP/Panel/Form/Sound/AdminSetAPI.pm @@ -16,7 +16,7 @@ has_field 'reseller_id' => ( has_block 'fields' => ( tag => 'div', class => [qw/modal-body/], - render_list => [qw/reseller_id customer_id name description contract_default copy_from_default language loopplay override/], + render_list => [qw/reseller_id customer_id name description contract_default copy_from_default language loopplay replace_existing/], ); diff --git a/lib/NGCP/Panel/Form/Sound/LoadDefault.pm b/lib/NGCP/Panel/Form/Sound/LoadDefault.pm index 4767accfca..0ecdaf1d62 100644 --- a/lib/NGCP/Panel/Form/Sound/LoadDefault.pm +++ b/lib/NGCP/Panel/Form/Sound/LoadDefault.pm @@ -21,7 +21,7 @@ has_field 'save' => ( has_block 'fields' => ( tag => 'div', class => [qw/modal-body/], - render_list => [qw/language loopplay override/], + render_list => [qw/language loopplay replace_existing/], ); has_block 'actions' => ( diff --git a/lib/NGCP/Panel/Form/Sound/LoadDefaultBase.pm b/lib/NGCP/Panel/Form/Sound/LoadDefaultBase.pm index eb02131751..a3d14d4d6d 100644 --- a/lib/NGCP/Panel/Form/Sound/LoadDefaultBase.pm +++ b/lib/NGCP/Panel/Form/Sound/LoadDefaultBase.pm @@ -43,7 +43,7 @@ has_field 'loopplay' => ( required => 0, ); -has_field 'override' => ( +has_field 'replace_existing' => ( type => 'Boolean', label => 'Replace existing', element_attr => { diff --git a/lib/NGCP/Panel/Form/Sound/ResellerSetAPI.pm b/lib/NGCP/Panel/Form/Sound/ResellerSetAPI.pm index 54819e1969..46c4d32f79 100644 --- a/lib/NGCP/Panel/Form/Sound/ResellerSetAPI.pm +++ b/lib/NGCP/Panel/Form/Sound/ResellerSetAPI.pm @@ -16,7 +16,7 @@ has_field 'contract_id' => ( has_block 'fields' => ( tag => 'div', class => [qw/modal-body/], - render_list => [qw/customer_id name description contract_default copy_from_default language loopplay override/], + render_list => [qw/customer_id name description contract_default copy_from_default language loopplay replace_existing/], ); diff --git a/lib/NGCP/Panel/Form/Sound/SubadminSetAPI.pm b/lib/NGCP/Panel/Form/Sound/SubadminSetAPI.pm index 3ba8561c44..97680de769 100644 --- a/lib/NGCP/Panel/Form/Sound/SubadminSetAPI.pm +++ b/lib/NGCP/Panel/Form/Sound/SubadminSetAPI.pm @@ -39,7 +39,7 @@ has_field 'copy_from_default' => ( has_block 'fields' => ( tag => 'div', class => [qw/modal-body/], - render_list => [qw/name description contract_default copy_from_default language loopplay override/], + render_list => [qw/name description contract_default copy_from_default language loopplay replace_existing/], ); # TODO: inheritance? diff --git a/lib/NGCP/Panel/Role/API/SoundSets.pm b/lib/NGCP/Panel/Role/API/SoundSets.pm index 798a00c018..39f80af067 100644 --- a/lib/NGCP/Panel/Role/API/SoundSets.pm +++ b/lib/NGCP/Panel/Role/API/SoundSets.pm @@ -145,7 +145,7 @@ sub update_item { $resource->{contract_default} //= 0; - my $copy_from_default_params = { map {$_ => delete $resource->{$_}} (qw/copy_from_default loopplay override language/) }; + my $copy_from_default_params = { map {$_ => delete $resource->{$_}} (qw/copy_from_default loopplay replace_existing language/) }; $item->update($resource); if ($copy_from_default_params->{copy_from_default}) { my $error; @@ -156,7 +156,7 @@ sub update_item { set_id => $item->id, handles_rs => $handles_rs, loopplay => $copy_from_default_params->{loopplay}, - override => $copy_from_default_params->{override}, + override => $copy_from_default_params->{replace_existing}, error_ref => \$error, ); }