Index: lams_tool_assessment/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb688f36c54d742b7aaf6311323e5da98d7435f09
--- lams_tool_assessment/web/pages/learning/definelater.jsp (.../definelater.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/pages/learning/definelater.jsp (.../definelater.jsp) (revision b688f36c54d742b7aaf6311323e5da98d7435f09)
@@ -1,20 +1,7 @@
<%@include file="/common/taglibs.jsp"%>
-
+
-
-
- <%@ include file="/common/header.jsp"%>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
Index: lams_tool_doku/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb688f36c54d742b7aaf6311323e5da98d7435f09
--- lams_tool_doku/web/pages/learning/definelater.jsp (.../definelater.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/learning/definelater.jsp (.../definelater.jsp) (revision b688f36c54d742b7aaf6311323e5da98d7435f09)
@@ -1,22 +1,7 @@
<%@include file="/common/taglibs.jsp"%>
+
-
-
- <%@ include file="/common/header.jsp"%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rb688f36c54d742b7aaf6311323e5da98d7435f09
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java (.../LearningController.java) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java (.../LearningController.java) (revision b688f36c54d742b7aaf6311323e5da98d7435f09)
@@ -173,6 +173,8 @@
String mode = request.getParameter(McAppConstants.MODE);
request.setAttribute(AttributeNames.ATTR_MODE, mode);
request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, mcService.isLastActivity(new Long(toolSessionID)));
+ request.setAttribute(McAppConstants.TOOL_SESSION_ID, toolSessionID);
+ request.setAttribute(McAppConstants.ATTR_CONTENT, mcContent);
McQueUsr user = null;
if ((mode != null) && mode.equals(ToolAccessMode.TEACHER.toString())) {
@@ -249,8 +251,6 @@
Set groupUsers = mcSession.getMcQueUsers();// mcService.getUsersBySession(new
// Long(toolSessionID).longValue());
request.setAttribute(McAppConstants.ATTR_GROUP_USERS, groupUsers);
- request.setAttribute(McAppConstants.TOOL_SESSION_ID, toolSessionID);
- request.setAttribute(McAppConstants.ATTR_CONTENT, mcContent);
return "learning/WaitForLeader";
}
Index: lams_tool_lamc/web/learning/defineLater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb688f36c54d742b7aaf6311323e5da98d7435f09
--- lams_tool_lamc/web/learning/defineLater.jsp (.../defineLater.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/learning/defineLater.jsp (.../defineLater.jsp) (revision b688f36c54d742b7aaf6311323e5da98d7435f09)
@@ -1,19 +1,6 @@
<%@ include file="/common/taglibs.jsp"%>
-
-
-
- <fmt:message key="activity.title" />
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
Index: lams_tool_laqa/web/learning/defineLater.jsp
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -rb688f36c54d742b7aaf6311323e5da98d7435f09
--- lams_tool_laqa/web/learning/defineLater.jsp (.../defineLater.jsp) (revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_laqa/web/learning/defineLater.jsp (.../defineLater.jsp) (revision b688f36c54d742b7aaf6311323e5da98d7435f09)
@@ -2,7 +2,6 @@
<%@ include file="/common/taglibs.jsp"%>
-
-!${sessionMap.toolSessionID}
+
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java
===================================================================
diff -u -r3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db -rb688f36c54d742b7aaf6311323e5da98d7435f09
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java (.../LearningController.java) (revision 3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java (.../LearningController.java) (revision b688f36c54d742b7aaf6311323e5da98d7435f09)
@@ -80,11 +80,6 @@
Notebook notebook = notebookSession.getNotebook();
- // check defineLater
- if (notebook.isDefineLater()) {
- return "pages/learning/defineLater";
- }
-
// set mode, toolSessionID and NotebookDTO
request.setAttribute("mode", mode.toString());
messageForm.setToolSessionID(toolSessionID);
@@ -95,9 +90,13 @@
notebookDTO.allowRichEditor = notebook.isAllowRichEditor();
notebookDTO.lockOnFinish = notebook.isLockOnFinished();
notebookDTO.forceResponse = notebook.isForceResponse();
-
request.setAttribute("notebookDTO", notebookDTO);
+ // check defineLater
+ if (notebook.isDefineLater()) {
+ return "pages/learning/defineLater";
+ }
+
// Set the content in use flag.
if (!notebook.isContentInUse()) {
notebook.setContentInUse(true);
Index: lams_tool_notebook/web/pages/learning/defineLater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb688f36c54d742b7aaf6311323e5da98d7435f09
--- lams_tool_notebook/web/pages/learning/defineLater.jsp (.../defineLater.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/pages/learning/defineLater.jsp (.../defineLater.jsp) (revision b688f36c54d742b7aaf6311323e5da98d7435f09)
@@ -2,20 +2,9 @@
<%@ include file="/common/taglibs.jsp"%>
<%@ taglib uri="tags-lams" prefix="lams"%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+