Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rf8801506e4b6b221595fb585797851a9a6a09404 -r6f45d0fae19fa48d271e7fb5a052d0a28325977a
--- lams_tool_scratchie/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision f8801506e4b6b221595fb585797851a9a6a09404)
+++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 6f45d0fae19fa48d271e7fb5a052d0a28325977a)
@@ -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
===================================================================
diff -u -rf8801506e4b6b221595fb585797851a9a6a09404 -r6f45d0fae19fa48d271e7fb5a052d0a28325977a
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision f8801506e4b6b221595fb585797851a9a6a09404)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 6f45d0fae19fa48d271e7fb5a052d0a28325977a)
@@ -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;
}
// *************************************************************************************