Skip to content

Commit e851626

Browse files
committed
LUT-26831: simplify get response from backup
1 parent 91d4109 commit e851626

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/java/fr/paris/lutece/plugins/forms/service/FormService.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,16 +439,21 @@ private boolean canUserAccessFile( HttpServletRequest request, int nIdForm )
439439
* The form
440440
* @param strUserGuid
441441
* The user guid
442+
* @param formResponseManager
443+
*
442444
* @return the created {@code FormResponseManager} object
443445
*/
444-
public FormResponseManager createFormResponseManagerFromBackUp( Form form, String strUserGuid )
446+
public FormResponseManager createFormResponseManagerFromBackUp( Form form, String strUserGuid, FormResponseManager formResponseManager )
445447
{
446-
FormResponseManager formResponseManager = null;
447448
List<FormResponse> listFormResponse = FormResponseHome.getFormResponseByGuidAndForm( strUserGuid, form.getId( ), true );
448449
if ( CollectionUtils.isNotEmpty( listFormResponse ) )
449450
{
450451
formResponseManager = new FormResponseManager( listFormResponse.get( 0 ) );
451452
}
453+
else if ( formResponseManager != null && CollectionUtils.isEmpty( listFormResponse ) )
454+
{
455+
return formResponseManager;
456+
}
452457
else
453458
{
454459
formResponseManager = new FormResponseManager( form );

src/java/fr/paris/lutece/plugins/forms/web/FormXPage.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -884,6 +884,12 @@ public synchronized XPage doSaveStep( HttpServletRequest request ) throws SiteMe
884884
_currentStep = StepHome.findByPrimaryKey(Integer.parseInt(request.getParameter(FormsConstants.PARAMETER_ID_STEP)));
885885
List<String> errorList = new ArrayList<>( );
886886
_currentStep = FormsResponseUtils.getNextStep( _currentStep.getId( ), errorList, _formResponseManager );
887+
// print all parameters
888+
Enumeration<String> parameterNames = request.getParameterNames();
889+
while (parameterNames.hasMoreElements()) {
890+
String paramName = parameterNames.nextElement();
891+
AppLogService.error("########### : " + paramName + " : " + request.getParameter(paramName));
892+
}
887893
return getStepView( request );
888894
}
889895

@@ -1245,7 +1251,7 @@ private void initFormResponseManager( HttpServletRequest request, Form form )
12451251
{
12461252
if ( user != null && form.isBackupEnabled() )
12471253
{
1248-
_formResponseManager = _formService.createFormResponseManagerFromBackUp( form, user.getName( ) );
1254+
_formResponseManager = _formService.createFormResponseManagerFromBackUp( form, user.getName( ), _formResponseManager );
12491255
}
12501256
else
12511257
{
@@ -1302,7 +1308,6 @@ private void init( HttpServletRequest request )
13021308
_stepDisplayTree = null;
13031309
_breadcrumb = null;
13041310
_bInactiveStateBypassed = false;
1305-
IsRequestComingFromAction = false;
13061311
FormsAsynchronousUploadHandler.getHandler( ).removeSessionFiles( request.getSession( ) );
13071312
}
13081313

0 commit comments

Comments
 (0)