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

TT#29617 remove unnecessary form exceptions

Browse Source 
with the previous commit, there is no need anymore to specify form
exceptions manually. validate_form will now automatically consider fields
in the correct format with and without "_id"

Change-Id: I70afae4003c6407c7a37396630110736f1fb13f8
changes/09/18209/2
Gerhard Jungwirth 9 years ago
parent b0c3b25897
commit edbef3c5b8
74 changed files with 48 additions and 167 deletions
Show Stats Download Patch File Download Diff File

1
lib/NGCP/Panel/Controller/API/ApplyRewrites.pm
Unescape View File

@ -92,7 +92,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [qw/subscriber_id/],
);
my $subscriber_rs = $c->model('DB')->resultset('voip_subscribers')->search({

1
lib/NGCP/Panel/Controller/API/BillingFees.pm
Unescape View File

@ -227,7 +227,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => ['billing_profile_id'],
);

1
lib/NGCP/Panel/Controller/API/BillingNetworks.pm
Unescape View File

@ -188,7 +188,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "reseller_id" ],
);
last unless NGCP::Panel::Utils::Reseller::check_reseller_create_item($c,$resource->{reseller_id},sub {

1
lib/NGCP/Panel/Controller/API/BillingZones.pm
Unescape View File

@ -180,7 +180,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => ['billing_profile_id'],
);
my $profile = $schema->resultset('billing_profiles')->find($resource->{billing_profile_id});

1
lib/NGCP/Panel/Controller/API/CFDestinationSets.pm
Unescape View File

@ -176,7 +176,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "subscriber_id" ],
);
my $dset;

1
lib/NGCP/Panel/Controller/API/CFSourceSets.pm
Unescape View File

@ -183,7 +183,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "subscriber_id" ],
);
my $sset;

1
lib/NGCP/Panel/Controller/API/CFTimeSets.pm
Unescape View File

@ -176,7 +176,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "subscriber_id" ],
);
my $tset;

1
lib/NGCP/Panel/Controller/API/CallControls.pm
Unescape View File

@ -95,7 +95,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [qw/subscriber_id/],
);
my $subscriber_rs = $c->model('DB')->resultset('voip_subscribers')->search({

1
lib/NGCP/Panel/Controller/API/Contracts.pm
Unescape View File

@ -200,7 +200,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "contact_id", "billing_profile_id" ],
);
my $syscontact = $schema->resultset('contacts')

1
lib/NGCP/Panel/Controller/API/CustomerLocations.pm
Unescape View File

@ -170,7 +170,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => ['contract_id'],
);
last unless $self->prepare_blocks_resource($c,$resource);

1
lib/NGCP/Panel/Controller/API/Customers.pm
Unescape View File

@ -262,7 +262,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "contact_id", "billing_profile_id", "profile_package_id", "invoice_template_id", "invoice_email_template_id", "passreset_email_template_id", "subscriber_email_template_id" ],
);
#$resource->{profile_package_id} = undef unless NGCP::Panel::Utils::ProfilePackages::ENABLE_PROFILE_PACKAGES;

1
lib/NGCP/Panel/Controller/API/Faxes.pm
Unescape View File

@ -215,7 +215,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [qw/subscriber_id/],
);
$c->log->debug("form validated");
my $billing_subscriber = NGCP::Panel::Utils::API::Subscribers::get_active_subscriber($self, $c, $resource->{subscriber_id});

1
lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm
Unescape View File

@ -171,7 +171,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [qw/ncos_level_id/],
);
my $level = $c->model('DB')->resultset('ncos_levels')->find(

1
lib/NGCP/Panel/Controller/API/NcosPatterns.pm
Unescape View File

@ -159,7 +159,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "ncos_level_id" ],
);
my $level_rs = $c->model('DB')->resultset('ncos_levels')->search({

1
lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm
Unescape View File

@ -182,7 +182,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "device_id" ],
);
my $model_rs = $c->model('DB')->resultset('autoprov_devices')->search({

1
lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm
Unescape View File

@ -183,7 +183,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "device_id" ],
);
my $model_rs = $c->model('DB')->resultset('autoprov_devices')->search({

1
lib/NGCP/Panel/Controller/API/PbxDevices.pm
Unescape View File

@ -189,7 +189,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => ['profile_id'],
);
my $iden_device = $schema->resultset('autoprov_field_devices')->find({identifier => $resource->{identifier}});

1
lib/NGCP/Panel/Controller/API/PeeringInboundRules.pm
Unescape View File

@ -182,7 +182,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [qw/group_id/],
);
unless($c->model('DB')->resultset('voip_peer_groups')->find($resource->{group_id})) {
$c->log->error("peering group $$resource{group_id} does not exist");

1
lib/NGCP/Panel/Controller/API/PeeringRules.pm
Unescape View File

@ -182,7 +182,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [qw/group_id/],
);
my $dup_item = $c->model('DB')->resultset('voip_peer_rules')->find({
group_id => $resource->{group_id},

1
lib/NGCP/Panel/Controller/API/PeeringServers.pm
Unescape View File

@ -204,7 +204,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [qw/group_id/],
);
my $dup_item = $c->model('DB')->resultset('voip_peer_hosts')->find({
name => $resource->{name},

1
lib/NGCP/Panel/Controller/API/ProfilePackages.pm
Unescape View File

@ -201,7 +201,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "reseller_id" ],
);
last unless NGCP::Panel::Utils::Reseller::check_reseller_create_item($c,$resource->{reseller_id},sub {

1
lib/NGCP/Panel/Controller/API/Reminders.pm
Unescape View File

@ -178,7 +178,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "subscriber_id" ],
);
my $sub = $self->get_subscriber_by_id($c, $resource->{subscriber_id} );

12
lib/NGCP/Panel/Controller/API/Subscribers.pm
Unescape View File

@ -315,15 +315,15 @@ sub GET :Allow {
contract_id_field => 'contract_id');
my $now = NGCP::Panel::Utils::DateTime::current_local;
my (@embedded, @links, %contract_map);
my ($form,$form_exceptions) //= $self->get_form($c);
my ($form) //= $self->get_form($c);
for my $subscriber (@$subscribers) {
my $contract = $subscriber->contract;
NGCP::Panel::Utils::ProfilePackages::get_contract_balance(c => $c,
contract => $contract,
now => $now) if !exists $contract_map{$contract->id}; #apply underrun lock level
$contract_map{$contract->id} = 1;
my $resource = $self->resource_from_item($c, $subscriber, $form,$form_exceptions);
push @embedded, $self->hal_from_item($c, $subscriber, $resource, $form,$form_exceptions);
my $resource = $self->resource_from_item($c, $subscriber, $form);
push @embedded, $self->hal_from_item($c, $subscriber, $resource, $form);
push @links, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,
href => sprintf('%s%d', $self->dispatch_path, $subscriber->id),
@ -479,10 +479,10 @@ sub POST :Allow {
last unless $self->add_create_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
my ($_form,$_form_exceptions) = $self->get_form($c);
my ($_form) = $self->get_form($c);
my $_subscriber = $self->item_by_id($c, $subscriber->id);
my $_resource = $self->resource_from_item($c, $_subscriber, $_form,$_form_exceptions);
return $self->hal_from_item($c,$_subscriber,$_resource,$_form,$_form_exceptions); });
my $_resource = $self->resource_from_item($c, $_subscriber, $_form);
return $self->hal_from_item($c,$_subscriber,$_resource,$_form); });
$guard->commit;

20
lib/NGCP/Panel/Controller/API/SubscribersItem.pm
Unescape View File

@ -81,9 +81,9 @@ sub GET :Allow {
); #apply underrun lock level
my ($form, $form_exceptions) = $self->get_form($c);
my $resource = $self->resource_from_item($c, $subscriber, $form, $form_exceptions);
my $hal = $self->hal_from_item($c, $subscriber, $resource, $form, $form_exceptions);
my ($form) = $self->get_form($c);
my $resource = $self->resource_from_item($c, $subscriber, $form);
my $hal = $self->hal_from_item($c, $subscriber, $resource, $form);
$guard->commit; #potential db write ops in hal_from
my $response = HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
@ -150,8 +150,8 @@ sub PUT :Allow {
$resource = $r->{resource};
my ($form, $form_exceptions) = $self->get_form($c);
$subscriber = $self->update_item($c, $schema, $subscriber, $r, $resource, $form, $form_exceptions);
my ($form) = $self->get_form($c);
$subscriber = $self->update_item($c, $schema, $subscriber, $r, $resource, $form);
last unless $subscriber;
$resource = $self->resource_from_item($c, $subscriber, $form);
@ -206,8 +206,8 @@ sub PATCH :Allow {
);
last unless $json;
my ($form, $form_exceptions) = $self->get_form($c);
my $old_resource = $self->resource_from_item($c, $subscriber, $form, $form_exceptions);
my ($form) = $self->get_form($c);
my $old_resource = $self->resource_from_item($c, $subscriber, $form);
$old_resource = clone($old_resource);
my $resource = $self->apply_patch($c, $old_resource, $json);
last unless $resource;
@ -292,10 +292,10 @@ sub DELETE :Allow {
last unless $self->add_delete_journal_item_hal($c,sub {
my $self = shift;
my ($c) = @_;
my ($_form,$_form_exceptions) = $self->get_form($c);
my ($_form) = $self->get_form($c);
#my $_subscriber = $self->item_by_id($c, $id);
my $_resource = $self->resource_from_item($c, $subscriber, $_form, $_form_exceptions);
return $self->hal_from_item($c,$subscriber,$_resource,$_form, $_form_exceptions); });
my $_resource = $self->resource_from_item($c, $subscriber, $_form);
return $self->hal_from_item($c,$subscriber,$_resource,$_form); });
NGCP::Panel::Utils::Subscriber::terminate(c => $c, subscriber => $subscriber);

1
lib/NGCP/Panel/Controller/API/TopupCash.pm
Unescape View File

@ -111,7 +111,6 @@ sub POST :Allow {
form => $form,
# due to the _id suffix, it would be converted to package.id and subscriber.id in
# the validation, so exclude them here
exceptions => [qw/package_id subscriber_id/],
);
last unless NGCP::Panel::Utils::Voucher::check_topup(c => $c,

1
lib/NGCP/Panel/Controller/API/TopupVouchers.pm
Unescape View File

@ -110,7 +110,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [qw/subscriber_id/],
);
last unless NGCP::Panel::Utils::Voucher::check_topup(c => $c,

1
lib/NGCP/Panel/Controller/API/TrustedSources.pm
Unescape View File

@ -164,7 +164,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "subscriber_id" ],
);
my $sub_rs = $c->model('DB')->resultset('voip_subscribers')->search({

1
lib/NGCP/Panel/Controller/API/UpnRewriteSets.pm
Unescape View File

@ -163,7 +163,6 @@ sub POST :Allow {
c => $c,
resource => $resource,
form => $form,
exceptions => [ "subscriber_id" ],
);
my $sub_rs = $c->model('DB')->resultset('voip_subscribers')->search({

1
lib/NGCP/Panel/Form/Voicemail/GreetingAPI.pm
Unescape View File

@ -7,7 +7,6 @@ use HTML::FormHandler::Widget::Block::Bootstrap;
has '+enctype' => ( default => 'multipart/form-data');
has '+widget_wrapper' => ( default => 'Bootstrap' );
has 'validation_exceptions' => ( is => 'rw', isa => 'ArrayRef', default => sub {[qw/subscriber_id/];} );
has_field 'submitid' => ( type => 'Hidden' );

22
lib/NGCP/Panel/Role/API.pm
Unescape View File

@ -891,11 +891,8 @@ sub delay_commit {
sub hal_from_item {
my ($self, $c, $item, $form, $params) = @_;
my ($form_exceptions);
if(!$form){
($form,$form_exceptions) = $self->get_form($c);
}else{
$form_exceptions = $params->{form_exceptions};
($form) = $self->get_form($c);
}
my $resource = $self->resource_from_item($c, $item, $form);
$resource = $self->process_hal_resource($c, $item, $resource, $form);
@ -936,7 +933,6 @@ sub hal_from_item {
c => $c,
resource => $resource,
form => $form,
$form_exceptions ? (exceptions => $form_exceptions) : (),
run => 0,
);
}
@ -948,25 +944,21 @@ sub hal_from_item {
sub update_item {
my ($self, $c, $item, $old_resource, $resource, $form, $params) = @_;
my ($form_exceptions, $process_extras);
($form, $form_exceptions, $process_extras) = @{$params}{qw/form form_exceptions process_extras/};
my $process_extras;
($form, $process_extras) = @{$params}{qw/form process_extras/}; # TODO: form can be passed twice?
$old_resource //= $self->resource_from_item($c, $item, $form);
$process_extras //= {};
if(!$form){
($form, $form_exceptions) = $self->get_form($c, 'edit');
($form) = $self->get_form($c, 'edit');
}
if($form){
if(!$form_exceptions && $form->can('form_exceptions')){
$form_exceptions = $form->form_exceptions;
}
last unless $self->pre_process_form_resource($c, $item, $old_resource, $resource, $form, $process_extras);
return unless $self->validate_form(
c => $c,
resource => $resource,
form => $form,
$form_exceptions ? (exceptions => $form_exceptions) : (),
);
return unless $resource;
}
@ -978,7 +970,7 @@ sub update_item {
$item = $self->update_item_model($c, $item, $old_resource, $resource, $form, $process_extras);
return $item, $form, $form_exceptions, $process_extras;
return $item, $form, $process_extras;
}
#------ dummy & default methods
@ -1147,7 +1139,7 @@ sub relation {
#------ /accessors ---
sub return_representation{
my($self, $c, %params) = @_;
my($hal, $response, $item, $preference, $form, $form_exceptions) = @params{qw/hal response item preference form form_exceptions/};
my($hal, $response, $item, $preference, $form) = @params{qw/hal response item preference form/};
$preference //= $self->require_preference($c);
return unless $preference;
@ -1169,7 +1161,7 @@ sub return_representation{
sub return_representation_post{
my($self, $c, %params) = @_;
my($hal, $response, $item, $preference, $form, $form_exceptions) = @params{qw/hal response item preference form form_exceptions/};
my($hal, $response, $item, $preference, $form) = @params{qw/hal response item preference form/};
$preference //= $self->require_preference($c);
return unless $preference;

1
lib/NGCP/Panel/Role/API/AutoAttendants.pm
Unescape View File

@ -48,7 +48,6 @@ sub hal_from_item {
form => $form,
resource => $resource,
run => 0,
exceptions => ['subscriber_id'],
);
$hal->resource($resource);

1
lib/NGCP/Panel/Role/API/BalanceIntervals.pm
Unescape View File

@ -126,7 +126,6 @@ sub hal_from_balance {
resource => \%resource,
form => $form,
run => 0,
exceptions => [ 'billing_profile_id', 'invoice_id' ],
);
#$resource{id} = int($item->contract->id);

2
lib/NGCP/Panel/Role/API/BillingFees.pm
Unescape View File

@ -67,7 +67,6 @@ sub hal_from_fee {
form => $form,
resource => \%resource,
run => 0,
exceptions => ['billing_profile_id'],
);
$resource{id} = int($fee->id);
@ -102,7 +101,6 @@ sub update_fee {
c => $c,
form => $form,
resource => $resource,
exceptions => ['billing_profile_id'],
);
my $profile;

2
lib/NGCP/Panel/Role/API/BillingNetworks.pm
Unescape View File

@ -60,7 +60,6 @@ sub hal_from_item {
form => $form,
resource => \%resource,
run => 0,
exceptions => [ "reseller_id" ],
);
$hal->resource(\%resource);
return $hal;
@ -104,7 +103,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "reseller_id" ],
);
return unless NGCP::Panel::Utils::Reseller::check_reseller_update_item($c,$resource->{reseller_id},$old_resource->{reseller_id},sub {

2
lib/NGCP/Panel/Role/API/BillingZones.pm
Unescape View File

@ -68,7 +68,6 @@ sub hal_from_zone {
form => $form,
resource => \%resource,
run => 0,
exceptions => ['billing_profile_id'],
);
$resource{id} = int($zone->id);
@ -100,7 +99,6 @@ sub update_zone {
c => $c,
form => $form,
resource => $resource,
exceptions => ['billing_profile_id'],
);
if($old_resource->{billing_profile_id} != $resource->{billing_profile_id}) {

1
lib/NGCP/Panel/Role/API/CCMapEntries.pm
Unescape View File

@ -59,7 +59,6 @@ sub hal_from_item {
form => $form,
resource => \%resource,
run => 0,
exceptions => ['subscriber_id'],
);
$hal->resource(\%resource);

2
lib/NGCP/Panel/Role/API/CFDestinationSets.pm
Unescape View File

@ -73,7 +73,6 @@ sub hal_from_item {
form => $form,
resource => \%resource,
run => 0,
exceptions => [ "subscriber_id" ],
);
$hal->resource(\%resource);
return $hal;
@ -120,7 +119,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "subscriber_id" ],
);
if($c->user->roles eq "subscriberadmin" || $c->user->roles eq "subscriber") {
$resource->{subscriber_id} = $c->user->voip_subscriber->id;

2
lib/NGCP/Panel/Role/API/CFSourceSets.pm
Unescape View File

@ -65,7 +65,6 @@ sub hal_from_item {
form => $form,
resource => \%resource,
run => 0,
exceptions => [ "subscriber_id" ],
);
$hal->resource(\%resource);
return $hal;
@ -113,7 +112,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "subscriber_id" ],
);
if (! exists $resource->{sources} ) {

2
lib/NGCP/Panel/Role/API/CFTimeSets.pm
Unescape View File

@ -64,7 +64,6 @@ sub hal_from_item {
form => $form,
resource => \%resource,
run => 0,
exceptions => [ "subscriber_id" ],
);
$hal->resource(\%resource);
return $hal;
@ -111,7 +110,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "subscriber_id" ],
);
if (! exists $resource->{times} ) {

1
lib/NGCP/Panel/Role/API/CallLists.pm
Unescape View File

@ -94,7 +94,6 @@ sub hal_from_item {
resource => $resource,
form => $form,
run => 0,
exceptions => [qw/call_id/],
);
$resource->{id} = int($item->id);

13
lib/NGCP/Panel/Role/API/Calls.pm
Unescape View File

@ -64,19 +64,6 @@ sub hal_from_item {
resource => $resource,
form => $form,
run => 0,
exceptions => [
"source_provider_id", "destination_provider_id",
"source_external_subscriber_id", "destination_external_subscriber_id",
"source_external_contract_id", "destination_external_contract_id",
"source_carrier_billing_fee_id", "destination_carrier_billing_fee_id",
"source_reseller_billing_fee_id", "destination_reseller_billing_fee_id",
"source_customer_billing_fee_id", "destination_customer_billing_fee_id",
"source_carrier_billing_zone_id", "destination_carrier_billing_zone_id",
"source_reseller_billing_zone_id", "destination_reseller_billing_zone_id",
"source_customer_billing_zone_id", "destination_customer_billing_zone_id",
"start_time", "init_time", # "duration",
"call_id",
],
);
$resource->{id} = int($item->id);

2
lib/NGCP/Panel/Role/API/Contracts.pm
Unescape View File

@ -88,7 +88,6 @@ sub hal_from_contract {
form => $form,
resource => \%resource,
run => 0,
exceptions => [ "contact_id", "billing_profile_id" ],
);
$resource{type} = $billing_mapping->product->class;
@ -124,7 +123,6 @@ sub update_contract {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "contact_id", "billing_profile_id" ],
);
#my $now = NGCP::Panel::Utils::DateTime::current_local;

2
lib/NGCP/Panel/Role/API/Conversations.pm
Unescape View File

@ -735,7 +735,7 @@ sub _get_alias {
sub get_form {
my ($self, $c) = @_;
return (NGCP::Panel::Form::get("NGCP::Panel::Form::Conversation::API", $c),[qw/id call_id source_user_id source_account_id destination_user_id destination_account_id call_id subscriber_id voicemail_subscriber_id/]);
return (NGCP::Panel::Form::get("NGCP::Panel::Form::Conversation::API", $c));
}
sub process_hal_resource {

2
lib/NGCP/Panel/Role/API/CustomerLocations.pm
Unescape View File

@ -59,7 +59,6 @@ sub hal_from_item {
form => $form,
resource => \%resource,
run => 0,
exceptions => ['contract_id'],
);
$hal->resource(\%resource);
return $hal;
@ -97,7 +96,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => ['contract_id'],
);
return unless NGCP::Panel::Utils::ContractLocations::check_network_update_item($c,$resource,$item,sub {

2
lib/NGCP/Panel/Role/API/Customers.pm
Unescape View File

@ -98,7 +98,6 @@ sub hal_from_customer {
form => $form,
resource => \%resource,
run => 0,
exceptions => [ "contact_id", "billing_profile_id", "profile_package_id", "invoice_template_id", "invoice_email_template_id", "passreset_email_template_id", "subscriber_email_template_id" ],
);
foreach my $field (qw/create_timestamp activate_timestamp modify_timestamp terminate_timestamp/){
@ -145,7 +144,6 @@ sub update_customer {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "contact_id", "billing_profile_id", "profile_package_id", "invoice_template_id", "invoice_email_template_id", "passreset_email_template_id", "subscriber_email_template_id"],
);
#$resource->{profile_package_id} = undef unless NGCP::Panel::Utils::ProfilePackages::ENABLE_PROFILE_PACKAGES;

4
lib/NGCP/Panel/Role/API/Events.pm
Unescape View File

@ -104,10 +104,6 @@ sub hal_from_item {
resource => \%resource,
form => $form,
run => 0,
exceptions => [qw/id subscriber_id reseller_id
primary_number_id subscriber_profile_id subscriber_profile_set_id
pilot_subscriber_id
pilot_primary_number_id pilot_subscriber_profile_id pilot_subscriber_profile_set_id/],
);
$resource{id} = int($item->id);

2
lib/NGCP/Panel/Role/API/Invoices.pm
Unescape View File

@ -44,7 +44,7 @@ sub _item_rs {
sub get_form {
my ($self, $c) = @_;
return (NGCP::Panel::Form::get("NGCP::Panel::Form::Invoice::InvoiceAPI", $c),['customer_id','template_id']);
return (NGCP::Panel::Form::get("NGCP::Panel::Form::Invoice::InvoiceAPI", $c));
}
sub hal_links {

1
lib/NGCP/Panel/Role/API/MaliciousCalls.pm
Unescape View File

@ -62,7 +62,6 @@ sub hal_from_item {
resource => \%resource,
form => $form,
run => 0,
exceptions => [qw/call_id/],
);
$resource{id} = int($item->id);

2
lib/NGCP/Panel/Role/API/NcosLnpCarriers.pm
Unescape View File

@ -50,7 +50,6 @@ sub hal_from_item {
resource => \%resource,
form => $form,
run => 0,
exceptions => [qw/ncos_level_id/],
);
$resource{id} = int($item->id);
@ -82,7 +81,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [qw/ncos_level_id/],
);
my $level = $c->model('DB')->resultset('ncos_levels')->find(

2
lib/NGCP/Panel/Role/API/NcosPatterns.pm
Unescape View File

@ -58,7 +58,6 @@ sub hal_from_item {
resource => \%resource,
form => $form,
run => 0,
exceptions => [ "ncos_level_id" ],
);
$resource{id} = int($item->id);
@ -80,7 +79,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "ncos_level_id" ],
);
my $level_rs = $c->model('DB')->resultset('ncos_levels')->search({

2
lib/NGCP/Panel/Role/API/Numbers.pm
Unescape View File

@ -56,7 +56,6 @@ sub hal_from_item {
resource => \%resource,
form => $form,
run => 0,
exceptions => [ qw/subscriber_id/ ],
);
$resource{id} = int($item->id);
@ -133,7 +132,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ qw/subscriber_id/ ],
);
my $sub = $schema->resultset('voip_subscribers')

2
lib/NGCP/Panel/Role/API/PbxDeviceConfigs.pm
Unescape View File

@ -60,7 +60,6 @@ sub hal_from_item {
resource => $resource,
form => $form,
run => 0,
exceptions => [qw/device_id/],
);
$resource->{id} = int($item->id);
@ -95,7 +94,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [qw/device_id/],
);
my $model_rs = $c->model('DB')->resultset('autoprov_devices')->search({

2
lib/NGCP/Panel/Role/API/PbxDeviceFirmwares.pm
Unescape View File

@ -60,7 +60,6 @@ sub hal_from_item {
resource => $resource,
form => $form,
run => 0,
exceptions => [qw/device_id/],
);
$resource->{id} = int($item->id);
@ -90,7 +89,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [qw/device_id/],
);
my $model_rs = $c->model('DB')->resultset('autoprov_devices')->search({

3
lib/NGCP/Panel/Role/API/PbxDeviceModels.pm
Unescape View File

@ -78,13 +78,12 @@ sub resource_from_item {
delete $resource{front_image};
delete $resource{mac_image};
my ($form,$form_exceptions) = $self->get_form($c);
my ($form) = $self->get_form($c);
return unless $self->validate_form(
c => $c,
form => $form,
resource => \%resource,
run => 0,
exceptions => $form_exceptions,
);
foreach my $field (qw/reseller_id id extensions_num/){

2
lib/NGCP/Panel/Role/API/PbxDevices.pm
Unescape View File

@ -74,7 +74,6 @@ sub resource_from_item {
form => $form,
resource => \%resource,
run => 0,
exceptions => ['profile_id'],
);
$resource{lines} = \@lines;
$resource{id} = int($item->id);
@ -121,7 +120,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => ['profile_id'],
);
my $iden_device = $schema->resultset('autoprov_field_devices')->find({identifier => $resource->{identifier}});

2
lib/NGCP/Panel/Role/API/PeeringInboundRules.pm
Unescape View File

@ -49,7 +49,6 @@ sub hal_from_item {
c => $c,
resource => \%resource,
form => $form,
exceptions => [qw/group_id/],
run => 0,
);
@ -72,7 +71,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [qw/group_id/],
);
unless($c->model('DB')->resultset('voip_peer_groups')->find($resource->{group_id})) {
$c->log->error("peering group $$resource{group_id} does not exist");

2
lib/NGCP/Panel/Role/API/PeeringRules.pm
Unescape View File

@ -49,7 +49,6 @@ sub hal_from_item {
c => $c,
resource => \%resource,
form => $form,
exceptions => [qw/group_id/],
run => 0,
);
@ -72,7 +71,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [qw/group_id/],
);
my $dup_item = $c->model('DB')->resultset('voip_peer_rules')->find({
group_id => $resource->{group_id},

2
lib/NGCP/Panel/Role/API/PeeringServers.pm
Unescape View File

@ -50,7 +50,6 @@ sub hal_from_item {
resource => \%resource,
form => $form,
run => 0,
exceptions => [qw/group_id/],
);
$resource{id} = int($item->id);
@ -72,7 +71,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [qw/group_id/],
);
my $dup_item = $c->model('DB')->resultset('voip_peer_hosts')->find({

2
lib/NGCP/Panel/Role/API/ProfilePackages.pm
Unescape View File

@ -80,7 +80,6 @@ sub hal_from_item {
form => $form,
resource => \%resource,
run => 0,
exceptions => [ "reseller_id" ],
);
$hal->resource(\%resource);
return $hal;
@ -130,7 +129,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "reseller_id" ],
);
return unless NGCP::Panel::Utils::Reseller::check_reseller_update_item($c,$resource->{reseller_id},$old_resource->{reseller_id},sub {

2
lib/NGCP/Panel/Role/API/Reminders.pm
Unescape View File

@ -84,7 +84,6 @@ sub hal_from_item {
resource => $resource,
form => $form,
run => 0,
exceptions => [ "subscriber_id" ],
);
$resource->{id} = int($item->id);
@ -115,7 +114,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "subscriber_id" ],
);
my $sub = $self->get_subscriber_by_id($c, $resource->{subscriber_id} );
return unless $sub;

4
lib/NGCP/Panel/Role/API/RewriteRuleSets.pm
Unescape View File

@ -30,9 +30,9 @@ sub get_form {
return (NGCP::Panel::Form::get("NGCP::Panel::Form::RewriteRule::RuleAPI", $c));
}
if($c->user->roles eq "admin") {
return (NGCP::Panel::Form::get("NGCP::Panel::Form::RewriteRule::AdminSetAPI", $c), [qw/reseller_id/]);
return (NGCP::Panel::Form::get("NGCP::Panel::Form::RewriteRule::AdminSetAPI", $c));
} else {
return (NGCP::Panel::Form::get("NGCP::Panel::Form::RewriteRule::ResellerSet", $c), [qw/reseller_id/]);
return (NGCP::Panel::Form::get("NGCP::Panel::Form::RewriteRule::ResellerSet", $c));
}
}

2
lib/NGCP/Panel/Role/API/RewriteRules.pm
Unescape View File

@ -45,7 +45,7 @@ sub _item_rs {
sub get_form {
my ($self, $c) = @_;
return ( NGCP::Panel::Form::get("NGCP::Panel::Form::RewriteRule::RuleAPI", $c), ['set_id'] );
return ( NGCP::Panel::Form::get("NGCP::Panel::Form::RewriteRule::RuleAPI", $c) );
}
sub hal_links{

1
lib/NGCP/Panel/Role/API/RtcApps.pm
Unescape View File

@ -61,7 +61,6 @@ sub hal_from_item {
form => $form,
resource => $resource,
run => 0,
exceptions => ['rtc_user_id'],
);
}

1
lib/NGCP/Panel/Role/API/RtcNetworks.pm
Unescape View File

@ -63,7 +63,6 @@ sub hal_from_item {
form => $form,
resource => $resource,
run => 0,
exceptions => ['rtc_user_id'],
);
}

2
lib/NGCP/Panel/Role/API/SMS.pm
Unescape View File

@ -21,7 +21,7 @@ sub resource_name {
sub get_form {
my ($self, $c) = @_;
return (NGCP::Panel::Form::get("NGCP::Panel::Form::SMSAPI", $c), ['subscriber_id']);
return (NGCP::Panel::Form::get("NGCP::Panel::Form::SMSAPI", $c));
}
sub hal_links {

2
lib/NGCP/Panel/Role/API/SoundFiles.pm
Unescape View File

@ -92,7 +92,6 @@ sub hal_from_item {
resource => $resource,
form => $form,
run => 0,
exceptions => [ "set_id" ],
);
$resource->{id} = int($item->id);
@ -128,7 +127,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "set_id" ],
);
$resource->{loopplay} = ($resource->{loopplay} eq "true" || is_int($resource->{loopplay}) && $resource->{loopplay}) ? 1 : 0;

2
lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm
Unescape View File

@ -69,7 +69,6 @@ sub hal_from_item {
resource => $resource,
form => $form,
run => 0,
exceptions => [ "subscriber_id" ],
);
$resource->{user_agent} = $user_agent;
@ -151,7 +150,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "subscriber_id" ],
run => 1,
#form_params => { 'use_fields_for_input_without_param' => 1 },
);

17
lib/NGCP/Panel/Role/API/Subscribers.pm
Unescape View File

@ -23,14 +23,14 @@ sub get_form {
my ($self, $c) = @_;
if($c->user->roles eq "admin" || $c->user->roles eq "reseller") {
return (NGCP::Panel::Form::get("NGCP::Panel::Form::Subscriber::SubscriberAPI", $c),[qw/customer_id/]);
return (NGCP::Panel::Form::get("NGCP::Panel::Form::Subscriber::SubscriberAPI", $c));
} elsif($c->user->roles eq "subscriberadmin" || $c->user->roles eq "subscriber") {
return (NGCP::Panel::Form::get("NGCP::Panel::Form::Subscriber::SubscriberSubAdminAPI", $c),[qw/customer_id/]);
return (NGCP::Panel::Form::get("NGCP::Panel::Form::Subscriber::SubscriberSubAdminAPI", $c));
}
}
sub resource_from_item {
my ($self, $c, $item, $form, $form_exceptions) = @_;
my ($self, $c, $item, $form) = @_;
my $pref;
my $bill_resource = { $item->get_inflated_columns };
@ -61,13 +61,12 @@ sub resource_from_item {
$resource{timezone} = undef;
}
if(!$form){
($form,$form_exceptions) = $self->get_form($c);
($form) = $self->get_form($c);
}
last unless $self->validate_form(
c => $c,
resource => \%resource,
form => $form,
exceptions => $form_exceptions,
run => 0,
);
@ -154,7 +153,7 @@ sub resource_from_item {
}
sub hal_from_item {
my ($self, $c, $item, $resource, $form, $form_exceptions) = @_;
my ($self, $c, $item, $resource, $form) = @_;
my $is_sub = 1;
if($c->user->roles eq "admin" || $c->user->roles eq "reseller") {
$is_sub = 0;
@ -364,13 +363,11 @@ sub prepare_resource {
}
}
my ($form,$form_exceptions) = $self->get_form($c);
my ($form) = $self->get_form($c);
return unless $self->validate_form(
c => $c,
resource => $resource,
form => $form,
exceptions => $form_exceptions,
);
unless($domain) {
@ -598,7 +595,7 @@ sub prepare_resource {
}
sub update_item {
my ($self, $c, $schema, $item, $full_resource, $resource, $form, $form_exceptions) = @_;
my ($self, $c, $schema, $item, $full_resource, $resource, $form) = @_;
if($c->user->roles eq "subscriberadmin" || $c->user->roles eq "subscriber") {
$self->error($c, HTTP_FORBIDDEN, "Read-only resource for authenticated role");

1
lib/NGCP/Panel/Role/API/TopupLogs.pm
Unescape View File

@ -78,7 +78,6 @@ sub hal_from_item {
resource => \%resource,
form => $form,
run => 0,
exceptions => [qw/id subscriber_id contract_id voucher_id package_before_id package_after_id profile_before_id profile_after_id contract_balance_before_id contract_balance_after_id/],
);
$resource{id} = int($item->id);

2
lib/NGCP/Panel/Role/API/TrustedSources.pm
Unescape View File

@ -61,7 +61,6 @@ sub hal_from_item {
resource => $resource,
form => $form,
run => 0,
exceptions => [ "subscriber_id" ],
);
$resource->{id} = int($item->id);
@ -92,7 +91,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "subscriber_id" ],
);
my $sub_rs = $c->model('DB')->resultset('voip_subscribers')->search({

2
lib/NGCP/Panel/Role/API/UpnRewriteSets.pm
Unescape View File

@ -60,7 +60,6 @@ sub hal_from_item {
resource => $resource,
form => $form,
run => 0,
exceptions => [ "subscriber_id" ],
);
$resource->{id} = int($item->id);
@ -92,7 +91,6 @@ sub update_item {
c => $c,
form => $form,
resource => $resource,
exceptions => [ "subscriber_id" ],
);
my $sub_rs = $c->model('DB')->resultset('voip_subscribers')->search({

2
lib/NGCP/Panel/Role/API/VoicemailGreetings.pm
Unescape View File

@ -69,7 +69,7 @@ sub _item_rs {
sub get_form {
my ($self, $c) = @_;
return (NGCP::Panel::Form::get("NGCP::Panel::Form::Voicemail::GreetingAPI", $c), ['subscriber_id'] );
return (NGCP::Panel::Form::get("NGCP::Panel::Form::Voicemail::GreetingAPI", $c));
}
sub process_hal_resource{

12
lib/NGCP/Panel/Role/Entities.pm
Unescape View File

@ -54,10 +54,10 @@ sub get {
return unless $items;
(my $total_count, $items) = $self->paginate_order_collection($c, $items);
my (@embedded, @links);
my ($form, $form_exceptions) = $self->get_form($c);
my ($form) = $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, { form_exceptions => $form_exceptions });
push @embedded, $self->hal_from_item($c, $item, $form, {});
push @links, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,
href => sprintf('/%s%s', $c->request->path, $self->get_item_id($c,
@ -101,7 +101,7 @@ sub post {
my ($c) = @_;
my $guard = $self->get_transaction_control($c);
{
my ($form, $form_exceptions) = $self->get_form($c, 'add');
my ($form) = $self->get_form($c, 'add');
my $method_config = $self->config->{action}->{POST};
my $process_extras= {};
my ($resource) = $self->get_valid_data(
@ -113,15 +113,11 @@ sub post {
);
last unless $resource;
#instead of type parameter get_form can check request method
if(!$form_exceptions && $form->can('form_exceptions')){
$form_exceptions = $form->form_exceptions;
}
last unless $self->pre_process_form_resource($c, undef, undef, $resource, $form, $process_extras);
last unless $self->validate_form(
c => $c,
resource => $resource,
form => $form,
$form_exceptions ? (exceptions => $form_exceptions) : (),
);
last unless $self->process_form_resource($c, undef, undef, $resource, $form, $process_extras);
last unless $resource;
@ -137,7 +133,7 @@ sub post {
return if defined $c->stash->{api_error_message};
$self->return_representation_post($c, 'item' => $item, 'form' => $form, 'form_exceptions' => $form_exceptions );
$self->return_representation_post($c, 'item' => $item, 'form' => $form );
}
return;
}

15
lib/NGCP/Panel/Role/EntitiesItem.pm
Unescape View File

@ -82,8 +82,8 @@ sub patch {
my $preference = $self->require_preference($c);
last unless $preference;
my ($form, $form_exceptions, $process_extras);
($form, $form_exceptions) = $self->get_form($c, 'edit');
my ($form, $process_extras);
($form) = $self->get_form($c, 'edit');
my $json = $self->get_valid_patch_data(
c => $c,
@ -101,7 +101,7 @@ sub patch {
my $resource = $self->apply_patch($c, $old_resource, $json);
last unless $resource;
($item, $form, $form_exceptions, $process_extras) = $self->update_item($c, $item, $old_resource, $resource, $form, $process_extras );
($item, $form, $process_extras) = $self->update_item($c, $item, $old_resource, $resource, $form, $process_extras );
last unless $item;
$self->complete_transaction($c);
@ -111,7 +111,6 @@ sub patch {
'item' => $item,
'form' => $form,
'preference' => $preference,
'form_exceptions' => $form_exceptions
);
}
return;
@ -124,11 +123,10 @@ sub put {
my $preference = $self->require_preference($c);
last unless $preference;
#TODO: MOVE form exceptions to proper forms as property
#$old_resource = clone($old_resource);
##without it error: The entity could not be processed: Modification of a read-only value attempted at /usr/share/perl5/JSON/Pointer.pm line 200, <$fh> line 1.\n
my ($form, $form_exceptions, $process_extras);
($form, $form_exceptions) = $self->get_form($c, 'edit');
my ($form, $process_extras);
($form) = $self->get_form($c, 'edit');
my $item = $self->item_by_id_valid($c, $id);
last unless $item;
@ -144,7 +142,7 @@ sub put {
last unless $resource;
my $old_resource = $self->resource_from_item($c, $item);
($item, $form, $form_exceptions, $process_extras) = $self->update_item($c, $item, $old_resource, $resource, $form, $process_extras );
($item, $form, $process_extras) = $self->update_item($c, $item, $old_resource, $resource, $form, $process_extras );
last unless $item;
$self->complete_transaction($c);
@ -153,7 +151,6 @@ sub put {
'item' => $item,
'form' => $form,
'preference' => $preference,
'form_exceptions' => $form_exceptions
);
}
return;

Write Preview
Loading…
Cancel
Save