Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.23 -r1.24
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	17 Jan 2006 04:17:01 -0000	1.23
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	18 Jan 2006 23:23:34 -0000	1.24
@@ -140,6 +140,7 @@
 		request.getSession().setAttribute(ForumConstants.ALLOW_RICH_EDITOR, allowRichEditor);
 		request.getSession().setAttribute(ForumConstants.LIMITED_CHARS, new Integer(allowNumber));
 		boolean lock = session.getForum().getLockWhenFinished();
+		lock = lock && (session.getStatus() == ForumConstants.SESSION_STATUS_FINISHED ? true:false);
 		request.getSession().setAttribute(ForumConstants.FINISHEDLOCK,new Boolean(lock));
 
 		//get all root topic to display on init page
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewforum.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	11 Nov 2005 00:33:38 -0000	1.3
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	18 Jan 2006 23:23:35 -0000	1.4
@@ -15,12 +15,12 @@
 	<html:rewrite page="/learning/finish.do?toolSessionID=${param.toolSessionID}" />
 </c:set> 
 	
-<html:button property="newtopic" onclick="javascript:location.href='${newtopic}';">
+<html:button property="newtopic" onclick="javascript:location.href='${newtopic}';" disabled="${finishedLock}" >
 	<fmt:message key="label.newtopic"/>
 </html:button>
-<html:button property="refresh" onclick="javascript:location.href='${refresh}';" >
+<html:button property="refresh" onclick="javascript:location.href='${refresh}';" disabled="${finishedLock}" >
 	<fmt:message key="label.refresh"/>
 </html:button>
-<html:button property="finish" onclick="javascript:location.href='${finish}';">
+<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${finishedLock}" >
 	<fmt:message key="label.finish"/>
 </html:button>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicview.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	15 Nov 2005 05:57:42 -0000	1.5
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	18 Jan 2006 23:23:34 -0000	1.6
@@ -40,22 +40,24 @@
 			<tr>
 				<td align="right">
 					<br>
-					<c:if test="${topic.isAuthor}">
-					<c:if test="${sessionScope.allowEdit}">
-						<c:set var="edittopic">
-							<html:rewrite page="/learning/editTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
+					<c:if test="${topic.isAuthor &&  (not finishedLock)}">
+						<c:if test="${sessionScope.allowEdit}">
+							<c:set var="edittopic">
+								<html:rewrite page="/learning/editTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
+							</c:set> 
+							<html:link href="${edittopic}">
+								<b><fmt:message key="label.edit" /></b>
+							</html:link>
+						</c:if>
+					</c:if>
+					<c:if test="${not finishedLock}">
+						<c:set var="replytopic">
+							<html:rewrite page="/learning/newReplyTopic.do?parentId=${topic.message.uid}" />
 						</c:set> 
-						<html:link href="${edittopic}">
-							<b><fmt:message key="label.edit" /></b>
+						<html:link href="${replytopic}">
+							<b><fmt:message key="label.reply" /></b>
 						</html:link>
 					</c:if>
-					</c:if>
-					<c:set var="replytopic">
-						<html:rewrite page="/learning/newReplyTopic.do?parentId=${topic.message.uid}" />
-					</c:set> 
-					<html:link href="${replytopic}">
-						<b><fmt:message key="label.reply" /></b>
-					</html:link>
 				</td>
 			</tr>
 		</table>