TT#21819 Allow to adjust resource before form validation

Change-Id: I47d71a6df12bdaa6f20f30fd9562f1ad2d91ecad

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);
 

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);