Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/Attic/NbAuthoringStarterAction.java,v diff -u -r1.4 -r1.5 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java 19 Jul 2005 07:17:50 -0000 1.4 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java 20 Jul 2005 04:15:56 -0000 1.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java,v diff -u -r1.2 -r1.3 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java 15 Jul 2005 07:06:00 -0000 1.2 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java 20 Jul 2005 04:16:19 -0000 1.3 @@ -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--------------------