Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v
diff -u -r1.50 -r1.51
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	29 Aug 2006 00:49:35 -0000	1.50
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	29 Aug 2006 01:10:05 -0000	1.51
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/struts-actions.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/conf/xdoclet/struts-actions.xml	14 Jun 2006 06:02:28 -0000	1.4
+++ lams_tool_sbmt/conf/xdoclet/struts-actions.xml	29 Aug 2006 01:06:59 -0000	1.5
@@ -1,6 +1,10 @@
 <!-- ========== Action Mapping Definitions ============================== -->
 <action path="/definelater" type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction" 
-		name="SbmtAuthoringForm" scope="request" parameter="dispatch" validate="false">
+		name="SbmtAuthoringForm" 
+		scope="request" 
+		input="/authoring/definelater.jsp"
+		parameter="dispatch" 
+		validate="false">
 	<forward name="success" path="/authoring/definelater.jsp"/>
 	<forward name="forbidden" path="/authoring/definelaterforbid.jsp"/>
 </action>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java,v
diff -u -r1.27 -r1.28
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	28 Aug 2006 07:23:20 -0000	1.27
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	29 Aug 2006 01:06:59 -0000	1.28
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.34 -r1.35
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	28 Aug 2006 07:23:21 -0000	1.34
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	29 Aug 2006 01:06:59 -0000	1.35
@@ -143,16 +143,6 @@
         redirect="false"
       />
       <forward
-        name="author"
-        path="/authoring/authoring.jsp"
-        redirect="false"
-      />
-      <forward
-        name="monitor"
-        path="/authoring/definelater.jsp"
-        redirect="false"
-      />
-      <forward
         name="instructionFileList"
         path="/authoring/parts/instructionfilelist.jsp"
         redirect="false"
@@ -161,7 +151,11 @@
 
    <!-- ========== Action Mapping Definitions ============================== -->
 <action path="/definelater" type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction" 
-		name="SbmtAuthoringForm" scope="request" parameter="dispatch" validate="false">
+		name="SbmtAuthoringForm" 
+		scope="request" 
+		input="/authoring/definelater.jsp"
+		parameter="dispatch" 
+		validate="false">
 	<forward name="success" path="/authoring/definelater.jsp"/>
 	<forward name="forbidden" path="/authoring/definelaterforbid.jsp"/>
 </action>