Revert "TT#21819 Allow to adjust resource before form validation"

This reverts commit 2031ea21c5.

Change-Id: I6f4092eddc6f7c203c808e3c9ce255c49aa7aa41
changes/73/15873/2
Andrii Pogrebennyk 8 years ago
parent b3d28df754
commit 2bcac80e96

@ -932,11 +932,6 @@ 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;
@ -949,6 +944,13 @@ 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);

@ -122,9 +122,6 @@ 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,
@ -132,6 +129,9 @@ 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);

Loading…
Cancel
Save