Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java
===================================================================
diff -u -r0d58de1fbc5b7e7ab913902946d3368c14ccfb98 -r99ab61277d430fb532c14c217f14fa763aa4def9
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java (.../NbLearnerController.java) (revision 0d58de1fbc5b7e7ab913902946d3368c14ccfb98)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java (.../NbLearnerController.java) (revision 99ab61277d430fb532c14c217f14fa763aa4def9)
@@ -162,7 +162,10 @@
}
boolean readOnly = false;
- ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, false);
+ if (NbLearnerForm.getMode() == null) {
+ NbLearnerForm.setMode(ToolAccessMode.LEARNER.toString());
+ }
+ ToolAccessMode mode = WebUtil.getToolAccessMode(NbLearnerForm.getMode());
Long userID = null;
if (mode == ToolAccessMode.LEARNER || mode == ToolAccessMode.AUTHOR) {
userID = getUserID(request);
@@ -225,16 +228,14 @@
@RequestMapping("/teacher")
public String teacher(@ModelAttribute NbLearnerForm NbLearnerForm, HttpServletRequest request,
HttpServletResponse response) throws NbApplicationException {
-
- request.setAttribute("mode", "teacher");
+ NbLearnerForm.setMode("teacher");
return learner(NbLearnerForm, request, response);
}
@RequestMapping("/author")
public String author(@ModelAttribute NbLearnerForm NbLearnerForm, HttpServletRequest request,
HttpServletResponse response) throws NbApplicationException {
-
- request.setAttribute("mode", "author");
+ NbLearnerForm.setMode("author");
return learner(NbLearnerForm, request, response);
}
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java
===================================================================
diff -u -r0d58de1fbc5b7e7ab913902946d3368c14ccfb98 -r99ab61277d430fb532c14c217f14fa763aa4def9
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java (.../NbMonitoringController.java) (revision 0d58de1fbc5b7e7ab913902946d3368c14ccfb98)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java (.../NbMonitoringController.java) (revision 99ab61277d430fb532c14c217f14fa763aa4def9)
@@ -51,6 +51,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
/**
* The buttons are a switch between tabs and will forward to a jsp and display
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java
===================================================================
diff -u -rebd388504924fe0a06bbf20a06fe0032abbf8d15 -r99ab61277d430fb532c14c217f14fa763aa4def9
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java (.../NbPedagogicalPlannerForm.java) (revision ebd388504924fe0a06bbf20a06fe0032abbf8d15)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java (.../NbPedagogicalPlannerForm.java) (revision 99ab61277d430fb532c14c217f14fa763aa4def9)
@@ -25,15 +25,14 @@
import java.util.List;
import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
-import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
+import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivitySpringForm;
import org.springframework.util.StringUtils;
-import org.springframework.validation.Errors;
/**
*
*
*/
-public class NbPedagogicalPlannerForm extends PedagogicalPlannerActivityForm {
+public class NbPedagogicalPlannerForm extends PedagogicalPlannerActivitySpringForm {
private String basicContent;
private String contentFolderID;
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r0d58de1fbc5b7e7ab913902946d3368c14ccfb98 -r99ab61277d430fb532c14c217f14fa763aa4def9
--- lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision 0d58de1fbc5b7e7ab913902946d3368c14ccfb98)
+++ lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision 99ab61277d430fb532c14c217f14fa763aa4def9)
@@ -24,7 +24,7 @@
}
function submitForm(methodName) {
var f = document.getElementById('nbLearnerForm');
- f.action += "?mode=" + methodName;
+ f.action += methodName + ".do";
f.submit();
}
@@ -34,7 +34,8 @@
-
+
+
Index: lams_tool_nb/web/monitoring/m_Summary.jsp
===================================================================
diff -u -r0d58de1fbc5b7e7ab913902946d3368c14ccfb98 -r99ab61277d430fb532c14c217f14fa763aa4def9
--- lams_tool_nb/web/monitoring/m_Summary.jsp (.../m_Summary.jsp) (revision 0d58de1fbc5b7e7ab913902946d3368c14ccfb98)
+++ lams_tool_nb/web/monitoring/m_Summary.jsp (.../m_Summary.jsp) (revision 99ab61277d430fb532c14c217f14fa763aa4def9)
@@ -31,8 +31,7 @@
|
-
-
+