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

MT#11009 Form->params => form->values

Browse Source 
Change-Id: I22fba4d3c5f6cdfb774d2106a867563d0d2f8c74
changes/70/1670/2
Irina Peshinskaya 11 years ago
parent 3bc8f283a2
commit 78cf4f1e93
5 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File

82
lib/NGCP/Panel/Controller/Customer.pm
Unescape View File

@ -646,34 +646,34 @@ sub subscriber_create :Chained('base') :PathPart('subscriber/create') :Args(0) {
my $pbxgroups = []; my $pbxgroups = [];
if($pbx && !$pbxadmin) { if($pbx && !$pbxadmin) {
my $pilot = $c->stash->{pilot}; my $pilot = $c->stash->{pilot};
$form->params->{domain}{id} = $pilot->domain_id; $form->values->{domain}{id} = $pilot->domain_id;
if ($form->value->{group_select}) { if ($form->value->{group_select}) {
$pbxgroups = decode_json($form->value->{group_select}); $pbxgroups = decode_json($form->value->{group_select});
} }
my $base_number = $pilot->primary_number; my $base_number = $pilot->primary_number;
if($base_number) { if($base_number) {
$preferences->{cloud_pbx_base_cli} = $base_number->cc . $base_number->ac . $base_number->sn; $preferences->{cloud_pbx_base_cli} = $base_number->cc . $base_number->ac . $base_number->sn;
if(defined $form->params->{pbx_extension}) { if(defined $form->values->{pbx_extension}) {
$form->params->{e164}{cc} = $base_number->cc; $form->values->{e164}{cc} = $base_number->cc;
$form->params->{e164}{ac} = $base_number->ac; $form->values->{e164}{ac} = $base_number->ac;
$form->params->{e164}{sn} = $base_number->sn . $form->params->{pbx_extension}; $form->values->{e164}{sn} = $base_number->sn . $form->values->{pbx_extension};
} }
} }
} }
if($pbx) { if($pbx) {
$form->params->{is_pbx_pilot} = 1 if $pbxadmin; $form->values->{is_pbx_pilot} = 1 if $pbxadmin;
$preferences->{cloud_pbx} = 1; $preferences->{cloud_pbx} = 1;
$preferences->{cloud_pbx_ext} = $form->params->{pbx_extension}; $preferences->{cloud_pbx_ext} = $form->values->{pbx_extension};
if($pbxadmin && $form->params->{e164}{cc} && $form->params->{e164}{sn}) { if($pbxadmin && $form->values->{e164}{cc} && $form->values->{e164}{sn}) {
$preferences->{cloud_pbx_base_cli} = $form->params->{e164}{cc} . $preferences->{cloud_pbx_base_cli} = $form->values->{e164}{cc} .
($form->params->{e164}{ac} // '') . ($form->values->{e164}{ac} // '') .
$form->params->{e164}{sn}; $form->values->{e164}{sn};
} }
if($c->stash->{pilot}) { if($c->stash->{pilot}) {
my $profile_set = $c->stash->{pilot}->provisioning_voip_subscriber->voip_subscriber_profile_set; my $profile_set = $c->stash->{pilot}->provisioning_voip_subscriber->voip_subscriber_profile_set;
if($profile_set) { if($profile_set) {
$form->params->{profile_set}{id} = $profile_set->id; $form->values->{profile_set}{id} = $profile_set->id;
} }
} }
@ -681,14 +681,14 @@ sub subscriber_create :Chained('base') :PathPart('subscriber/create') :Args(0) {
# TODO: only if it's not a fax/conf extension: # TODO: only if it's not a fax/conf extension:
$preferences->{shared_buddylist_visibility} = 1; $preferences->{shared_buddylist_visibility} = 1;
$preferences->{display_name} = $form->params->{display_name} $preferences->{display_name} = $form->values->{display_name}
if($form->params->{display_name}); if($form->values->{display_name});
} }
if($c->stash->{contract}->external_id) { if($c->stash->{contract}->external_id) {
$preferences->{ext_contract_id} = $c->stash->{contract}->external_id; $preferences->{ext_contract_id} = $c->stash->{contract}->external_id;
} }
if(defined $form->params->{external_id}) { if(defined $form->values->{external_id}) {
$preferences->{ext_subscriber_id} = $form->params->{external_id}; $preferences->{ext_subscriber_id} = $form->values->{external_id};
} }
if($c->stash->{billing_mapping}->billing_profile->prepaid) { if($c->stash->{billing_mapping}->billing_profile->prepaid) {
$preferences->{prepaid} = 1; $preferences->{prepaid} = 1;
@ -697,7 +697,7 @@ sub subscriber_create :Chained('base') :PathPart('subscriber/create') :Args(0) {
c => $c, c => $c,
schema => $schema, schema => $schema,
contract => $c->stash->{contract}, contract => $c->stash->{contract},
params => $form->params, params => $form->values,
admin_default => 0, admin_default => 0,
preferences => $preferences, preferences => $preferences,
); );
@ -968,26 +968,26 @@ sub pbx_group_create :Chained('base') :PathPart('pbx/group/create') :Args(0) {
my $base_number = $pilot->primary_number; my $base_number = $pilot->primary_number;
if($base_number) { if($base_number) {
$preferences->{cloud_pbx_base_cli} = $base_number->cc . $base_number->ac . $base_number->sn; $preferences->{cloud_pbx_base_cli} = $base_number->cc . $base_number->ac . $base_number->sn;
if(defined $form->params->{pbx_extension}) { if(defined $form->values->{pbx_extension}) {
$form->params->{e164}{cc} = $base_number->cc; $form->values->{e164}{cc} = $base_number->cc;
$form->params->{e164}{ac} = $base_number->ac; $form->values->{e164}{ac} = $base_number->ac;
$form->params->{e164}{sn} = $base_number->sn . $form->params->{pbx_extension}; $form->values->{e164}{sn} = $base_number->sn . $form->values->{pbx_extension};
} }
} }
$form->params->{is_pbx_pilot} = 0; $form->values->{is_pbx_pilot} = 0;
$form->params->{is_pbx_group} = 1; $form->values->{is_pbx_group} = 1;
$form->params->{domain}{id} = $pilot->domain_id; $form->values->{domain}{id} = $pilot->domain_id;
$form->params->{status} = 'active'; $form->values->{status} = 'active';
$preferences->{cloud_pbx} = 1; $preferences->{cloud_pbx} = 1;
$preferences->{cloud_pbx_hunt_policy} = $form->params->{pbx_hunt_policy}; $preferences->{cloud_pbx_hunt_policy} = $form->values->{pbx_hunt_policy};
$preferences->{cloud_pbx_hunt_timeout} = $form->params->{pbx_hunt_timeout}; $preferences->{cloud_pbx_hunt_timeout} = $form->values->{pbx_hunt_timeout};
$preferences->{cloud_pbx_ext} = $form->params->{pbx_extension}; $preferences->{cloud_pbx_ext} = $form->values->{pbx_extension};
my $billing_subscriber = NGCP::Panel::Utils::Subscriber::create_subscriber( my $billing_subscriber = NGCP::Panel::Utils::Subscriber::create_subscriber(
c => $c, c => $c,
schema => $schema, schema => $schema,
contract => $c->stash->{contract}, contract => $c->stash->{contract},
params => $form->params, params => $form->values,
admin_default => 0, admin_default => 0,
preferences => $preferences, preferences => $preferences,
); );
@ -1069,23 +1069,23 @@ sub pbx_group_edit :Chained('pbx_group_base') :PathPart('edit') :Args(0) {
my $schema = $c->model('DB'); my $schema = $c->model('DB');
$schema->txn_do(sub { $schema->txn_do(sub {
my $old_extension = $c->stash->{pbx_group}->provisioning_voip_subscriber->pbx_extension; my $old_extension = $c->stash->{pbx_group}->provisioning_voip_subscriber->pbx_extension;
$c->stash->{pbx_group}->provisioning_voip_subscriber->update($form->params); $c->stash->{pbx_group}->provisioning_voip_subscriber->update($form->values);
NGCP::Panel::Utils::Subscriber::update_subscriber_pbx_policy( NGCP::Panel::Utils::Subscriber::update_subscriber_pbx_policy(
c => $c, c => $c,
prov_subscriber => $c->stash->{pbx_group}->provisioning_voip_subscriber, prov_subscriber => $c->stash->{pbx_group}->provisioning_voip_subscriber,
'values' => { 'values' => {
cloud_pbx_hunt_policy => $form->params->{pbx_hunt_policy}, cloud_pbx_hunt_policy => $form->values->{pbx_hunt_policy},
cloud_pbx_hunt_timeout => $form->params->{pbx_hunt_timeout}, cloud_pbx_hunt_timeout => $form->values->{pbx_hunt_timeout},
} }
); );
if(defined $form->params->{pbx_extension} && if(defined $form->values->{pbx_extension} &&
$form->params->{pbx_extension} ne $old_extension) { $form->values->{pbx_extension} ne $old_extension) {
my $sub = $c->stash->{pbx_group}; my $sub = $c->stash->{pbx_group};
my $base_number = $c->stash->{pilot}->primary_number; my $base_number = $c->stash->{pilot}->primary_number;
my $e164 = { my $e164 = {
cc => $sub->primary_number->cc, cc => $sub->primary_number->cc,
ac => $sub->primary_number->ac, ac => $sub->primary_number->ac,
sn => $base_number->sn . $form->params->{pbx_extension}, sn => $base_number->sn . $form->values->{pbx_extension},
}; };
NGCP::Panel::Utils::Subscriber::update_subscriber_numbers( NGCP::Panel::Utils::Subscriber::update_subscriber_numbers(
c => $c, c => $c,
@ -1148,12 +1148,12 @@ sub pbx_device_create :Chained('base') :PathPart('pbx/device/create') :Args(0) {
my $err; my $err;
my $schema = $c->model('DB'); my $schema = $c->model('DB');
$schema->txn_do( sub { $schema->txn_do( sub {
my $station_name = $form->params->{station_name}; my $station_name = $form->values->{station_name};
my $identifier = lc $form->params->{identifier}; my $identifier = lc $form->values->{identifier};
if($identifier =~ /^([a-f0-9]{2}:){5}[a-f0-9]{2}$/) { if($identifier =~ /^([a-f0-9]{2}:){5}[a-f0-9]{2}$/) {
$identifier =~ s/\://g; $identifier =~ s/\://g;
} }
my $profile_id = $form->params->{profile_id}; my $profile_id = $form->values->{profile_id};
my $fdev = $c->stash->{contract}->autoprov_field_devices->create({ my $fdev = $c->stash->{contract}->autoprov_field_devices->create({
profile_id => $profile_id, profile_id => $profile_id,
identifier => $identifier, identifier => $identifier,
@ -1272,13 +1272,13 @@ sub pbx_device_edit :Chained('pbx_device_base') :PathPart('edit') :Args(0) {
my $schema = $c->model('DB'); my $schema = $c->model('DB');
$schema->txn_do( sub { $schema->txn_do( sub {
my $fdev = $c->stash->{pbx_device}; my $fdev = $c->stash->{pbx_device};
my $station_name = $form->params->{station_name}; my $station_name = $form->values->{station_name};
my $identifier = lc $form->params->{identifier}; my $identifier = lc $form->values->{identifier};
if($identifier =~ /^([a-f0-9]{2}:){5}[a-f0-9]{2}$/) { if($identifier =~ /^([a-f0-9]{2}:){5}[a-f0-9]{2}$/) {
$identifier =~ s/\://g; $identifier =~ s/\://g;
} }
my $old_identifier = $fdev->identifier; my $old_identifier = $fdev->identifier;
my $profile_id = $form->params->{profile_id}; my $profile_id = $form->values->{profile_id};
$fdev->update({ $fdev->update({
profile_id => $profile_id, profile_id => $profile_id,
identifier => $identifier, identifier => $identifier,

30
lib/NGCP/Panel/Controller/Invoice.pm
Unescape View File

@ -156,7 +156,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac
try { try {
my $schema = $c->model('DB'); my $schema = $c->model('DB');
$schema->txn_do(sub { $schema->txn_do(sub {
my $contract_id = $form->params->{contract}{id}; my $contract_id = $form->values->{contract}{id};
my $customer_rs = NGCP::Panel::Utils::Contract::get_customer_rs(c => $c); my $customer_rs = NGCP::Panel::Utils::Contract::get_customer_rs(c => $c);
my $customer = $customer_rs->find({ 'me.id' => $contract_id }); my $customer = $customer_rs->find({ 'me.id' => $contract_id });
unless($customer) { unless($customer) {
@ -167,11 +167,11 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac
); );
die; die;
} }
delete $form->params->{contract}; delete $form->values->{contract};
$form->params->{contract_id} = $contract_id; $form->values->{contract_id} = $contract_id;
my $tmpl_id = $form->params->{template}{id}; my $tmpl_id = $form->values->{template}{id};
delete $form->params->{template}; delete $form->values->{template};
my $tmpl = $schema->resultset('invoice_templates')->search({ my $tmpl = $schema->resultset('invoice_templates')->search({
id => $tmpl_id, id => $tmpl_id,
@ -210,7 +210,7 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac
} }
my $stime = NGCP::Panel::Utils::DateTime::from_string( my $stime = NGCP::Panel::Utils::DateTime::from_string(
delete $form->params->{period} delete $form->values->{period}
)->truncate(to => 'month'); )->truncate(to => 'month');
my $etime = $stime->clone->add(months => 1)->subtract(seconds => 1); my $etime = $stime->clone->add(months => 1)->subtract(seconds => 1);
@ -262,18 +262,18 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac
billing_profile => {$billing_profile->get_inflated_columns}, billing_profile => {$billing_profile->get_inflated_columns},
contract_balance => {$balance->get_inflated_columns}, contract_balance => {$balance->get_inflated_columns},
); );
@{$form->params}{qw/amount_net amount_vat amount_total/} = @$invoice_amounts{qw/amount_net amount_vat amount_total/}; @{$form->values}{qw/amount_net amount_vat amount_total/} = @$invoice_amounts{qw/amount_net amount_vat amount_total/};
# generate tmp serial here, derive one from after insert # generate tmp serial here, derive one from after insert
$form->params->{serial} = "tmp".time.int(rand(99999)); $form->values->{serial} = "tmp".time.int(rand(99999));
$form->params->{data} = undef; $form->values->{data} = undef;
#maybe inflation should be applied? Generation failed here, although the latest schema applied. #maybe inflation should be applied? Generation failed here, although the latest schema applied.
$form->params->{period_start} = $stime->ymd.' '. $stime->hms; $form->values->{period_start} = $stime->ymd.' '. $stime->hms;
$form->params->{period_end} = $etime->ymd.' '. $etime->hms; $form->values->{period_end} = $etime->ymd.' '. $etime->hms;
my $invoice; my $invoice;
try { try {
$invoice = $schema->resultset('invoices')->create($form->params); $invoice = $schema->resultset('invoices')->create($form->values);
} catch($e) { } catch($e) {
NGCP::Panel::Utils::Message->error( NGCP::Panel::Utils::Message->error(
c => $c, c => $c,
@ -312,9 +312,9 @@ sub create :Chained('inv_list') :PathPart('create') :Args() :Does(ACL) :ACLDetac
period_start => $stime, period_start => $stime,
period_end => $etime, period_end => $etime,
serial => $serial, serial => $serial,
amount_net => $form->params->{amount_net}, amount_net => $form->values->{amount_net},
amount_vat => $form->params->{amount_vat}, amount_vat => $form->values->{amount_vat},
amount_total => $form->params->{amount_total}, amount_total => $form->values->{amount_total},
}; };
$vars->{calls} = $calllist, $vars->{calls} = $calllist,
$vars->{zones} = { $vars->{zones} = {

24
lib/NGCP/Panel/Controller/InvoiceTemplate.pm
Unescape View File

@ -133,21 +133,21 @@ sub create :Chained('template_list') :PathPart('create') :Args() {
my $schema = $c->model('DB'); my $schema = $c->model('DB');
$schema->txn_do(sub { $schema->txn_do(sub {
if($c->user->roles eq "admin") { if($c->user->roles eq "admin") {
$form->params->{reseller_id} = $reseller_id ? $reseller_id : $form->params->{reseller}{id}; $form->values->{reseller_id} = $reseller_id ? $reseller_id : $form->values->{reseller}{id};
} elsif($c->user->roles eq "reseller") { } elsif($c->user->roles eq "reseller") {
$form->params->{reseller_id} = $c->user->reseller_id; $form->values->{reseller_id} = $c->user->reseller_id;
} }
delete $form->params->{reseller}; delete $form->values->{reseller};
my $dup_item = $schema->resultset('invoice_templates')->find({ my $dup_item = $schema->resultset('invoice_templates')->find({
reseller_id => $form->params->{reseller_id}, reseller_id => $form->values->{reseller_id},
name => $form->params->{name}, name => $form->values->{name},
}); });
if($dup_item) { if($dup_item) {
die( ["Template name should be unique", "showdetails"] ); die( ["Template name should be unique", "showdetails"] );
} }
my $tmpl_params = $form->params; my $tmpl_params = $form->values;
$tmpl_params->{data} //= NGCP::Panel::Utils::InvoiceTemplate::svg_content($c, $tmpl_params->{data}); $tmpl_params->{data} //= NGCP::Panel::Utils::InvoiceTemplate::svg_content($c, $tmpl_params->{data});
my $tmpl = $c->stash->{tmpl_rs}->create($tmpl_params); my $tmpl = $c->stash->{tmpl_rs}->create($tmpl_params);
@ -204,21 +204,21 @@ sub edit_info :Chained('base') :PathPart('editinfo') {
my $schema = $c->model('DB'); my $schema = $c->model('DB');
$schema->txn_do(sub { $schema->txn_do(sub {
if($c->user->roles eq "admin") { if($c->user->roles eq "admin") {
$form->params->{reseller_id} = $form->params->{reseller}{id}; $form->values->{reseller_id} = $form->values->{reseller}{id};
} elsif($c->user->roles eq "reseller") { } elsif($c->user->roles eq "reseller") {
$form->params->{reseller_id} = $c->user->reseller_id; $form->values->{reseller_id} = $c->user->reseller_id;
} }
delete $form->params->{reseller}; delete $form->values->{reseller};
my $dup_item = $schema->resultset('invoice_templates')->find({ my $dup_item = $schema->resultset('invoice_templates')->find({
reseller_id => $form->params->{reseller_id}, reseller_id => $form->values->{reseller_id},
name => $form->params->{name}, name => $form->values->{name},
}); });
if($dup_item && $dup_item->id != $tmpl->id) { if($dup_item && $dup_item->id != $tmpl->id) {
die( ["Template name should be unique", "showdetails"] ); die( ["Template name should be unique", "showdetails"] );
} }
$tmpl->update($form->params); $tmpl->update($form->values);
delete $c->session->{created_objects}->{reseller}; delete $c->session->{created_objects}->{reseller};
}); });

4
lib/NGCP/Panel/Controller/SubscriberProfile.pm
Unescape View File

@ -280,11 +280,11 @@ sub set_clone :Chained('set_base') :PathPart('clone') :Does(ACL) :ACLDetachTo('/
$schema->txn_do(sub { $schema->txn_do(sub {
my $reseller_id; my $reseller_id;
if($c->user->roles eq "admin") { if($c->user->roles eq "admin") {
$reseller_id = $form->params->{reseller}{id}; $reseller_id = $form->values->{reseller}{id};
} else { } else {
$reseller_id = $c->stash->{set}->reseller_id, $reseller_id = $c->stash->{set}->reseller_id,
} }
delete $form->params->{reseller}; delete $form->values->{reseller};
my $new_set = $schema->resultset('voip_subscriber_profile_sets')->create({ my $new_set = $schema->resultset('voip_subscriber_profile_sets')->create({
%{ $form->values }, %{ $form->values },
reseller_id => $c->stash->{set}->reseller_id, reseller_id => $c->stash->{set}->reseller_id,

10
lib/NGCP/Panel/Utils/Preferences.pm
Unescape View File

@ -495,23 +495,23 @@ sub create_preference_form {
} elsif ($c->stash->{preference_meta}->max_occur != 1) { } elsif ($c->stash->{preference_meta}->max_occur != 1) {
if($c->stash->{subscriber} && if($c->stash->{subscriber} &&
($c->stash->{preference_meta}->attribute eq "block_in_list" || $c->stash->{preference_meta}->attribute eq "block_out_list")) { ($c->stash->{preference_meta}->attribute eq "block_in_list" || $c->stash->{preference_meta}->attribute eq "block_out_list")) {
my $v = $form->params->{$c->stash->{preference_meta}->attribute}; my $v = $form->values->{$c->stash->{preference_meta}->attribute};
if($c->user->roles eq "subscriberadmin" || $c->user->roles eq "subscriber") { if($c->user->roles eq "subscriberadmin" || $c->user->roles eq "subscriber") {
$v =~ s/^(.+?)([*\[].*$)/$1/; # strip any trailing shell pattern stuff $v =~ s/^(.+?)([*\[].*$)/$1/; # strip any trailing shell pattern stuff
my $suffix = $2 // ""; my $suffix = $2 // "";
$form->params->{$c->stash->{preference_meta}->attribute} = NGCP::Panel::Utils::Subscriber::apply_rewrite( $form->values->{$c->stash->{preference_meta}->attribute} = NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c, subscriber => $c->stash->{subscriber}, number => $v, direction => 'callee_in' c => $c, subscriber => $c->stash->{subscriber}, number => $v, direction => 'callee_in'
); );
# rewrite it back for immediate display # rewrite it back for immediate display
$v = $form->params->{$c->stash->{preference_meta}->attribute}; $v = $form->values->{$c->stash->{preference_meta}->attribute};
$v = NGCP::Panel::Utils::Subscriber::apply_rewrite( $v = NGCP::Panel::Utils::Subscriber::apply_rewrite(
c => $c, subscriber => $c->stash->{subscriber}, number => $v, direction => 'caller_out' c => $c, subscriber => $c->stash->{subscriber}, number => $v, direction => 'caller_out'
); );
# restore stripped shell pattern stuff # restore stripped shell pattern stuff
$form->params->{$c->stash->{preference_meta}->attribute} .= $suffix; $form->values->{$c->stash->{preference_meta}->attribute} .= $suffix;
$v .= $suffix; $v .= $suffix;
} }
@ -520,7 +520,7 @@ sub create_preference_form {
try { try {
$pref_rs->create({ $pref_rs->create({
attribute_id => $c->stash->{preference_meta}->id, attribute_id => $c->stash->{preference_meta}->id,
value => $form->params->{$c->stash->{preference_meta}->attribute}, value => $form->values->{$c->stash->{preference_meta}->attribute},
}); });
NGCP::Panel::Utils::Message->info( NGCP::Panel::Utils::Message->info(
c => $c, c => $c,

Write Preview
Loading…
Cancel
Save