Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java =================================================================== diff -u -r0980e93d5628ca17b29cb29441ba525542739c01 -rc261f143be0756641bb0423662c0175aeb91ed7b --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 0980e93d5628ca17b29cb29441ba525542739c01) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision c261f143be0756641bb0423662c0175aeb91ed7b) @@ -871,21 +871,21 @@ ActionMessage error = new ActionMessage("error.title.empty"); errors.add(ActionMessages.GLOBAL_MESSAGE, error); } - boolean allowEdit = form.getForum().isAllowNewTopic(); -// define it later mode(TEACHER): need read out allowEdit flag rather than get from HTML form + boolean allowNewTopic = form.getForum().isAllowNewTopic(); +// define it later mode(TEACHER): need read out AllowNewTopic flag rather than get from HTML form //becuase defineLater does not include this field if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){ forumService = getForumManager(); Forum forumPO = forumService.getForumByContentId(form.getToolContentID()); if(forumPO != null) - allowEdit = forumPO.isAllowEdit(); + allowNewTopic = forumPO.isAllowNewTopic(); else{ //failure tolerance log.error("ERROR: Can not found Forum by toolContentID:"+ form.getToolContentID()); - allowEdit = true; + allowNewTopic = true; } } - if(!allowEdit){ + if(!allowNewTopic){ List topics = getTopicList(sessionMap); if(topics.size() == 0){ ActionMessage error = new ActionMessage("error.must.have.topic"); Index: lams_tool_sbmt/conf/xdoclet/struts-actions.xml =================================================================== diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -rc261f143be0756641bb0423662c0175aeb91ed7b --- lams_tool_sbmt/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888) +++ lams_tool_sbmt/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision c261f143be0756641bb0423662c0175aeb91ed7b) @@ -1,6 +1,10 @@ + name="SbmtAuthoringForm" + scope="request" + input="/authoring/definelater.jsp" + parameter="dispatch" + validate="false"> Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java =================================================================== diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -rc261f143be0756641bb0423662c0175aeb91ed7b --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java (.../AuthoringAction.java) (revision 671e0f31315ba99ec13f82789869ce2a01e0ea04) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java (.../AuthoringAction.java) (revision c261f143be0756641bb0423662c0175aeb91ed7b) @@ -70,8 +70,6 @@ * validate="false" * * @struts.action-forward name="success" path="/authoring/authoring.jsp" - * @struts.action-forward name="author" path="/authoring/authoring.jsp" - * @struts.action-forward name="monitor" path="/authoring/definelater.jsp" * @struts.action-forward name="instructionFileList" path="/authoring/parts/instructionfilelist.jsp" */ public class AuthoringAction extends LamsDispatchAction { @@ -163,10 +161,7 @@ ActionMessages errors = validate(authForm, mapping, request); if(!errors.isEmpty()){ saveErrors(request, errors); - if(mode.isAuthor()) - return mapping.findForward("author"); - else - return mapping.findForward("monitor"); + return mapping.getInputForward(); } SubmitFilesContent content = getContent(form); @@ -241,10 +236,7 @@ //to jump to common success page in lams_central request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE); - if(mode.isAuthor()) - return mapping.findForward("author"); - else - return mapping.findForward("monitor"); + return mapping.findForward("success"); } /** * Handle upload online instruction files request. Once the file uploaded successfully, database Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -rc261f143be0756641bb0423662c0175aeb91ed7b --- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 671e0f31315ba99ec13f82789869ce2a01e0ea04) +++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision c261f143be0756641bb0423662c0175aeb91ed7b) @@ -143,16 +143,6 @@ redirect="false" /> - - + name="SbmtAuthoringForm" + scope="request" + input="/authoring/definelater.jsp" + parameter="dispatch" + validate="false">