@@ -267,7 +267,7 @@ private void checkMyLuteceAuthentification( Form form, HttpServletRequest reques
267
267
public synchronized XPage getStepView ( HttpServletRequest request ) throws SiteMessageException , UserNotSignedException
268
268
{
269
269
String paramInit = request .getParameter ( FormsConstants .PARAMETER_INIT );
270
- if ( FormsConstants . PARAMETER_INIT . equals ( paramInit ) )
270
+ if ( Boolean . parseBoolean ( paramInit ) )
271
271
{
272
272
init ( request );
273
273
}
@@ -361,7 +361,7 @@ public synchronized XPage getStepView( HttpServletRequest request ) throws SiteM
361
361
SiteMessageService .setMessage ( request , FormsConstants .MESSAGE_ERROR_INACTIVE_FORM , SiteMessage .TYPE_ERROR );
362
362
}
363
363
}
364
- IsRequestComingFromAction = false ;
364
+ IsRequestComingFromAction = true ;
365
365
XPage xPage = getXPage ( TEMPLATE_VIEW_STEP , getLocale ( request ), model );
366
366
xPage .setTitle ( strTitleForm );
367
367
xPage .setPathLabel ( strPathForm );
@@ -895,6 +895,8 @@ public synchronized XPage doSaveStep( HttpServletRequest request ) throws SiteMe
895
895
// why are we here as we didn't try to save any backup ? So instead of throwing the error, we redirect.
896
896
AppLogService .error ("FormXPage l 897 : " + MESSAGE_ERROR_TOKEN );
897
897
_currentStep = StepHome .findByPrimaryKey (Integer .parseInt (request .getParameter (FormsConstants .PARAMETER_ID_STEP )));
898
+ List <String > errorList = new ArrayList <>( );
899
+ _currentStep = FormsResponseUtils .getNextStep ( _currentStep .getId ( ), errorList , _formResponseManager );
898
900
return getStepView ( request );
899
901
}
900
902
@@ -1311,6 +1313,7 @@ private void init( HttpServletRequest request )
1311
1313
_stepDisplayTree = null ;
1312
1314
_breadcrumb = null ;
1313
1315
_bInactiveStateBypassed = false ;
1316
+ IsRequestComingFromAction = false ;
1314
1317
FormsAsynchronousUploadHandler .getHandler ( ).removeSessionFiles ( request .getSession ( ) );
1315
1318
}
1316
1319
@@ -1326,6 +1329,7 @@ private void init( int nIdForm )
1326
1329
_formResponseManager = null ;
1327
1330
_stepDisplayTree = null ;
1328
1331
_breadcrumb = null ;
1332
+ IsRequestComingFromAction = false ;
1329
1333
}
1330
1334
1331
1335
/**
0 commit comments