Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java =================================================================== diff -u -r1fa952a7d56855ca8d295d038150661f0b8f9b93 -r7a4ea3e5ff301874a107ffd2230e9db4aaf31e2d --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java (.../NbAuthoringStarterAction.java) (revision 1fa952a7d56855ca8d295d038150661f0b8f9b93) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java (.../NbAuthoringStarterAction.java) (revision 7a4ea3e5ff301874a107ffd2230e9db4aaf31e2d) @@ -59,8 +59,8 @@ * * ----------------XDoclet Tags-------------------- * - * @struts:action path="/tool/nb/starter/authoring" name="NbAuthoringForm" scope="session" type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringStarterAction" - * input=".authoringStarter" validate="false" + * @struts:action path="/starter/authoring" name="NbAuthoringForm" scope="session" type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringStarterAction" + * validate="false" * @struts:action-forward name="basic" path=".nb_basic" * @struts:action-forward name="displayMessage" path=".message" * ----------------XDoclet Tags-------------------- @@ -89,13 +89,21 @@ Long contentId = NbAuthoringUtil.convertToLong(request.getParameter(NoticeboardConstants.TOOL_CONTENT_ID)); nbForm.setToolContentId(contentId.toString()); - // Long contentId = NbAuthoringUtil.convertToLong(nbForm.getToolContentId()); + if(contentId == null) { String error = "Tool content id missing. Unable to continue."; throw new NbApplicationException(error); } + /* if there is a defineLater request parameter, set the form value + * If a defineLater request parameter is not present, then it is just set to null. + * This is used in the basic screen, if defineLater is set, then in the basic page, + * the three tabs {Basic, Advanced, Instructions} are not visible. + */ + nbForm.setDefineLater((String)request.getParameter(NoticeboardConstants.DEFINE_LATER)); + + NbAuthoringUtil.cleanSession(request); /** TODO: remove this, info no longer stored in session, using ActionForms instead */ request.getSession().setAttribute(NoticeboardConstants.TOOL_CONTENT_ID, contentId); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java =================================================================== diff -u -r621d1c50c0bb02aa8221ca1ecfe7850b948f13d8 -r7a4ea3e5ff301874a107ffd2230e9db4aaf31e2d --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java (.../NbLearnerAction.java) (revision 621d1c50c0bb02aa8221ca1ecfe7850b948f13d8) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java (.../NbLearnerAction.java) (revision 7a4ea3e5ff301874a107ffd2230e9db4aaf31e2d) @@ -56,7 +56,7 @@ * * ----------------XDoclet Tags-------------------- * - * @struts:action path="/tool/nb/learner" name="NbLearnerForm" scope="session" type="org.lamsfoundation.lams.tool.noticeboard.web.NbLearnerAction" + * @struts:action path="/learner" name="NbLearnerForm" scope="session" type="org.lamsfoundation.lams.tool.noticeboard.web.NbLearnerAction" * input=".learnerContent" validate="false" parameter="method" * @struts:action-forward name="displayLearnerContent" path=".learnerContent" * ----------------XDoclet Tags--------------------