diff --git a/lib/NGCP/Panel/Role/API.pm b/lib/NGCP/Panel/Role/API.pm index 5b6844cb1c..7ddaa630f5 100644 --- a/lib/NGCP/Panel/Role/API.pm +++ b/lib/NGCP/Panel/Role/API.pm @@ -932,6 +932,11 @@ sub update_item { ($form, $form_exceptions) = $self->get_form($c, 'edit'); } + $old_resource //= $self->resource_from_item($c, $item, $form); + $process_extras //= {}; + return unless $self->process_form_resource($c, $item, $old_resource, $resource, $form, $process_extras); + return unless $resource; + if($form){ if(!$form_exceptions && $form->can('form_exceptions')){ $form_exceptions = $form->form_exceptions; @@ -944,13 +949,6 @@ sub update_item { ); return unless $resource; } - - $old_resource //= $self->resource_from_item($c, $item, $form); - - $process_extras //= {}; - - return unless $self->process_form_resource($c, $item, $old_resource, $resource, $form, $process_extras); - return unless $resource; return unless $self->check_duplicate($c, $item, $old_resource, $resource, $form, $process_extras); return unless $self->check_resource($c, $item, $old_resource, $resource, $form, $process_extras); diff --git a/lib/NGCP/Panel/Role/Entities.pm b/lib/NGCP/Panel/Role/Entities.pm index 9017569bac..0a87352463 100644 --- a/lib/NGCP/Panel/Role/Entities.pm +++ b/lib/NGCP/Panel/Role/Entities.pm @@ -122,6 +122,9 @@ sub post { if(!$form_exceptions && $form->can('form_exceptions')){ $form_exceptions = $form->form_exceptions; } + my $process_extras= {}; + last unless $self->process_form_resource($c, undef, undef, $resource, $form, $process_extras); + last unless $resource; last unless $self->validate_form( c => $c, resource => $resource, @@ -129,9 +132,6 @@ sub post { $form_exceptions ? (exceptions => $form_exceptions) : (), ); - my $process_extras= {}; - last unless $self->process_form_resource($c, undef, undef, $resource, $form, $process_extras); - last unless $resource; last unless $self->check_duplicate($c, undef, undef, $resource, $form, $process_extras); last unless $self->check_resource($c, undef, undef, $resource, $form, $process_extras);