From eab6dbc475d737bfabed0f22ebfab7330173b10a Mon Sep 17 00:00:00 2001 From: evdngsl <158455076+evdngsl@users.noreply.github.com> Date: Mon, 26 May 2025 10:26:51 +0200 Subject: [PATCH] Revert "LUT-28957 Checking answer completeness before submission" This reverts commit 3bed4befbb83190026d41b79685fbe1ef4707043. --- .../forms/resources/forms_messages.properties | 1 - .../resources/forms_messages_fr.properties | 1 - .../lutece/plugins/forms/web/FormXPage.java | 27 ------------------- 3 files changed, 29 deletions(-) diff --git a/src/java/fr/paris/lutece/plugins/forms/resources/forms_messages.properties b/src/java/fr/paris/lutece/plugins/forms/resources/forms_messages.properties index 785f542b7..433d37780 100644 --- a/src/java/fr/paris/lutece/plugins/forms/resources/forms_messages.properties +++ b/src/java/fr/paris/lutece/plugins/forms/resources/forms_messages.properties @@ -947,7 +947,6 @@ xpage.form.view.loadBackUp=Resuming backup of {0} response.xpage.form.view.pageTitle=My response to the form response.xpage.form.view.pagePathLabel=My response to the form -xpage.form.error.steps.validation=You have a validation error in the steps : {0} xpage.form.error.control={0} xpage.form.error.limitNumberResponse=You have already responded to this form, so you can no longer access it xpage.listForms.pagetitle=List of forms diff --git a/src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_fr.properties b/src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_fr.properties index 5733a643a..fe3ee1467 100644 --- a/src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_fr.properties +++ b/src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_fr.properties @@ -951,7 +951,6 @@ xpage.form.view.loadBackUp=Reprise de la sauvegarde du {0} response.xpage.form.view.pageTitle=Ma r\u00e9ponse au formulaire response.xpage.form.view.pagePathLabel=Ma r\u00e9ponse au formulaire -xpage.form.error.steps.validation=Vous avez une erreur de validation des \u00e9tapes : {0} xpage.form.error.control={0} xpage.form.error.limitNumberResponse=Vous avez d\u00e9j\u00e0 r\u00e9pondu \u00e0 ce formulaire, vous ne pouvez donc plus y acc\u00e9der xpage.listForms.pagetitle=Liste des formulaires diff --git a/src/java/fr/paris/lutece/plugins/forms/web/FormXPage.java b/src/java/fr/paris/lutece/plugins/forms/web/FormXPage.java index f0a76e440..c33800f9c 100644 --- a/src/java/fr/paris/lutece/plugins/forms/web/FormXPage.java +++ b/src/java/fr/paris/lutece/plugins/forms/web/FormXPage.java @@ -105,7 +105,6 @@ public class FormXPage extends MVCApplication protected static final String MESSAGE_PATH = "forms.xpage.form.view.pagePathLabel"; protected static final String MESSAGE_ERROR_NOT_RESPONSE_AGAIN_FORM = "forms.xpage.form.error.limitNumberResponse"; protected static final String MESSAGE_ERROR_CONTROL = "forms.xpage.form.error.control"; - protected static final String MESSAGE_ERROR_STEPS_VALIDATION = "forms.xpage.form.error.steps.validation"; protected static final String MESSAGE_LIST_FORMS_PAGETITLE = "forms.xpage.listForms.pagetitle"; protected static final String MESSAGE_LIST_FORMS_PATHLABEL = "forms.xpage.listForms.pathlabel"; private static final String MESSAGE_WARNING_LOST_SESSION = "forms.warning.lost.session"; @@ -609,18 +608,6 @@ public synchronized XPage doFormResponseSummary( HttpServletRequest request ) th return getStepView( request ); } FormsResponseUtils.fillResponseManagerWithResponses( request, true, _formResponseManager, _stepDisplayTree.getQuestions( ), false ); - List stepList = StepHome.getStepsListByForm( form.getId( ) ); - Set validatedStepIds = _formResponseManager.getValidatedSteps( ).stream( ).map( Step::getId ).collect( Collectors.toSet( ) ); - - List invalidSteps = stepList.stream( ).filter( step -> !validatedStepIds.contains( step.getId( ) ) ).collect( Collectors.toList( ) ); - - if ( !invalidSteps.isEmpty( ) ) - { - SiteMessageService.setMessage( request, MESSAGE_ERROR_STEPS_VALIDATION, new Object [ ] { - invalidSteps.stream( ).map(Step::getTitle).collect( Collectors.joining(", ") ) - }, null, null, null, SiteMessage.TYPE_ERROR, null, getViewFullUrl( VIEW_STEP ) ); - return getStepView( request ); - } boolean needValidation = form.isCaptchaStepFinal( ); if ( isCaptchaKO( request, needValidation ) ) { @@ -726,20 +713,6 @@ public synchronized XPage doSaveFormResponse( HttpServletRequest request ) throw return getStepView( request ); } FormsResponseUtils.fillResponseManagerWithResponses( request, true, _formResponseManager, _stepDisplayTree.getQuestions( ), false ); - - List stepList = StepHome.getStepsListByForm( form.getId( ) ); - Set validatedStepIds = _formResponseManager.getValidatedSteps( ).stream( ).map( Step::getId ).collect( Collectors.toSet( ) ); - - List invalidSteps = stepList.stream( ).filter( step -> !validatedStepIds.contains( step.getId( ) ) ).collect( Collectors.toList( ) ); - - if ( !invalidSteps.isEmpty( ) ) - { - SiteMessageService.setMessage( request, MESSAGE_ERROR_STEPS_VALIDATION, new Object [ ] { - invalidSteps.stream( ).map(Step::getTitle).collect( Collectors.joining(", ") ) - }, null, null, null, SiteMessage.TYPE_ERROR, null, getViewFullUrl( VIEW_STEP ) ); - return getStepView( request ); - } - boolean needValidation = form.isCaptchaStepFinal( ); if ( isCaptchaKO( request, needValidation ) ) {