Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/xdoclet/struts-actions.xml,v diff -u -r1.20.2.3 -r1.20.2.4 --- lams_tool_scratchie/conf/xdoclet/struts-actions.xml 5 Apr 2016 17:24:33 -0000 1.20.2.3 +++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml 8 Apr 2016 16:38:25 -0000 1.20.2.4 @@ -209,8 +209,8 @@ validate="false" parameter="saveBurningQuestions" scope="request"> - - + + - + Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java,v diff -u -r1.44.2.9 -r1.44.2.10 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java 5 Apr 2016 17:24:33 -0000 1.44.2.9 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java 8 Apr 2016 16:38:25 -0000 1.44.2.10 @@ -710,12 +710,16 @@ sessionMap.put(ScratchieConstants.ATTR_GENERAL_BURNING_QUESTION, generalQuestion); boolean isNotebookSubmitted = sessionMap.get(ScratchieConstants.ATTR_REFLECTION_ENTRY) != null; + ActionRedirect redirect; if (scratchie.isReflectOnActivity() && !isNotebookSubmitted) { - return newReflection(mapping, form, request, response); + redirect = new ActionRedirect(mapping.findForwardConfig("newReflection")); + // show results page } else { - return showResults(mapping, form, request, response); + redirect = new ActionRedirect(mapping.findForwardConfig("showResults")); } - + + redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); + return redirect; } /** @@ -800,8 +804,10 @@ LearningAction.service.updateEntry(entry); } sessionMap.put(ScratchieConstants.ATTR_REFLECTION_ENTRY, entryText); - - return showResults(mapping, refForm, request, response); + + ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("showResults")); + redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); + return redirect; } // *************************************************************************************