Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r91cb4b756363e0a31ae296c829d0d334210de334
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 91cb4b756363e0a31ae296c829d0d334210de334)
@@ -172,11 +172,9 @@
 	}
 
 	ToolAccessMode mode = getAccessMode(request);
-	if (mode.isAuthor()) {
-	    return mapping.findForward(DokumaranConstants.SUCCESS);
-	} else {
-	    return mapping.findForward(DokumaranConstants.DEFINE_LATER);
-	}
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+	
+	return mapping.findForward(DokumaranConstants.SUCCESS);
     }
 
     /**
@@ -203,28 +201,26 @@
 	// **********************************Get Dokumaran PO*********************
 	Dokumaran dokumaranPO = service.getDokumaranByContentId(dokumaran.getContentId());
 	if (dokumaranPO == null) {
-	    // new Dokumaran, create it.
+	    // new Dokumaran, create it
 	    dokumaranPO = dokumaran;
 	    dokumaranPO.setCreated(new Timestamp(new Date().getTime()));
 	    dokumaranPO.setUpdated(new Timestamp(new Date().getTime()));
+	    
 	} else {
-	    if (mode.isAuthor()) {
-		Long uid = dokumaranPO.getUid();
-		PropertyUtils.copyProperties(dokumaranPO, dokumaran);
+	    Long uid = dokumaranPO.getUid();
+	    PropertyUtils.copyProperties(dokumaranPO, dokumaran);
 
-		// copyProperties() above may result in "collection assigned to two objects in a session" exception
-		// Below we remove reference to one of Assessment objects,
-		// so maybe there will be just one object in session when save is done
-		// If this fails, we may have to evict the object from session using DAO
-		dokumaranForm.setDokumaran(null);
-		dokumaran = null;
-		// get back UID
-		dokumaranPO.setUid(uid);
-	    } else { // if it is Teacher, then just update basic tab content
-		// (definelater)
-		dokumaranPO.setInstructions(dokumaran.getInstructions());
-		dokumaranPO.setTitle(dokumaran.getTitle());
-		// change define later status
+	    // copyProperties() above may result in "collection assigned to two objects in a session" exception
+	    // Below we remove reference to one of Assessment objects,
+	    // so maybe there will be just one object in session when save is done
+	    // If this fails, we may have to evict the object from session using DAO
+	    dokumaranForm.setDokumaran(null);
+	    dokumaran = null;
+	    // get back UID
+	    dokumaranPO.setUid(uid);
+
+	    // if it's a teacher - change define later status
+	    if (mode.isTeacher()) {
 		dokumaranPO.setDefineLater(false);
 	    }
 	    dokumaranPO.setUpdated(new Timestamp(new Date().getTime()));
@@ -249,11 +245,9 @@
 	dokumaranForm.setDokumaran(dokumaranPO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
-	if (mode.isAuthor()) {
-	    return mapping.findForward("author");
-	} else {
-	    return mapping.findForward("monitor");
-	}
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+	
+	return mapping.findForward(DokumaranConstants.SUCCESS);
     }
 
     // *************************************************************************************
Index: lams_tool_doku/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r47200ab94fd2651b62702c9e4f2eb6eb989a08c1 -r91cb4b756363e0a31ae296c829d0d334210de334
--- lams_tool_doku/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 47200ab94fd2651b62702c9e4f2eb6eb989a08c1)
+++ lams_tool_doku/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 91cb4b756363e0a31ae296c829d0d334210de334)
@@ -73,16 +73,14 @@
 			parameter="initPage" 
 			validate="false">
 			<forward name="success" path="/pages/authoring/authoring.jsp" />
-			<forward name="definelater" path="/pages/authoring/definelater.jsp" />
 		</action>
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.dokumaran.web.action.AuthoringAction"
 			name="dokumaranForm" 
 			scope="request" 
 			parameter="updateContent" 
 			validate="false">
-			<forward name="author" path="/pages/authoring/authoring.jsp" />
-			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
+			<forward name="success" path="/pages/authoring/authoring.jsp" />
 		</action>
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
 		<action path="/learning/start"
Index: lams_tool_doku/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rd6fa07234d396367e63b1b59db70e70d0e7ccb60 -r91cb4b756363e0a31ae296c829d0d334210de334
--- lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d6fa07234d396367e63b1b59db70e70d0e7ccb60)
+++ lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 91cb4b756363e0a31ae296c829d0d334210de334)
@@ -31,6 +31,7 @@
 <html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
 	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 	<html:hidden property="dokumaran.contentId" />
+	<html:hidden property="mode" value="${mode}"/>
 	<html:hidden property="sessionMapID" />
 	<html:hidden property="contentFolderID" />
 	<html:hidden property="currentTab" styleId="currentTab" />
@@ -43,35 +44,35 @@
 			<lams:Tab id="2" key="label.authoring.heading.advance" />
 		</lams:Tabs>    
 
-	<lams:TabBodyArea>
-		<%@ include file="/common/messages.jsp"%>
-	   
-	    <!--  Set up tabs  -->
-	    <lams:TabBodys>
-			<!-- tab content 1 (Basic) -->
-			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
-			<!-- end of content (Basic) -->
+		<lams:TabBodyArea>
+			<%@ include file="/common/messages.jsp"%>
+		   
+		    <!--  Set up tabs  -->
+		    <lams:TabBodys>
+				<!-- tab content 1 (Basic) -->
+				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+				<!-- end of content (Basic) -->
+	
+				<!-- tab content 2 (Advanced) -->
+				<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+				<!-- end of content (Advanced) -->
+			</lams:TabBodys>
+				
+			<!-- Button Row -->
+			<%--  Default value 
+				cancelButtonLabelKey="label.authoring.cancel.button"
+				saveButtonLabelKey="label.authoring.save.button"
+				cancelConfirmMsgKey="authoring.msg.cancel.save"
+				accessMode="author"
+			--%>
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
+				toolSignature="<%=DokumaranConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.dokumaran.contentId}" 
+				 customiseSessionID="${formBean.sessionMapID}" accessMode="${mode}" defineLater="${mode=='teacher'}"
+				 contentFolderID="${formBean.contentFolderID}" />
+		</lams:TabBodyArea>
+	
+		<div id="footer"></div>
 
-			<!-- tab content 2 (Advanced) -->
-			<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
-			<!-- end of content (Advanced) -->
-		</lams:TabBodys>
-			
-		<!-- Button Row -->
-		<%--  Default value 
-			cancelButtonLabelKey="label.authoring.cancel.button"
-			saveButtonLabelKey="label.authoring.save.button"
-			cancelConfirmMsgKey="authoring.msg.cancel.save"
-			accessMode="author"
-		--%>
-		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
-			toolSignature="<%=DokumaranConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.dokumaran.contentId}" 
-			 customiseSessionID="${formBean.sessionMapID}"
-			 contentFolderID="${formBean.contentFolderID}" />
-	</lams:TabBodyArea>
-
-	<div id="footer"></div>
-
 	</lams:Page>
 </html:form>
 </body>
Fisheye: Tag 91cb4b756363e0a31ae296c829d0d334210de334 refers to a dead (removed) revision in file `lams_tool_doku/web/pages/authoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?