Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java,v
diff -u -r1.1 -r1.1.4.1
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java	13 Feb 2009 05:56:15 -0000	1.1
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java	5 May 2009 02:44:51 -0000	1.1.4.1
@@ -109,10 +109,12 @@
 	    PrintWriter out = response.getWriter();
 	    
 	    if(!rUser.isSessionFinished()) {
-	    	out.println("window.parent.opener.checkNew();");
+	    	out.println("window.parent.opener.checkNew(false);");
 	    	out.println("window.parent.opener=null;");
 	    	out.println("window.parent.close();");
 	    } else {
+	    	out.println("window.parent.opener.checkNew(true);");
+	    	out.println("window.parent.opener=null;");
 	    	out.println("window.parent.close();");
 	    }
 	    
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v
diff -u -r1.45 -r1.45.4.1
--- lams_tool_larsrc/web/pages/learning/learning.jsp	28 Feb 2009 06:50:58 -0000	1.45
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	5 May 2009 02:44:51 -0000	1.45.4.1
@@ -34,9 +34,16 @@
 	      	showMessage(gurl);
 	      	return false;
 		}
-		function checkNew(){
+		function checkNew(checkFinishedLock){
  		    var reqIDVar = new Date();
-			document.location.href = "<c:url value="/learning/start.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
+
+ 		    <c:if test="${finishedLock}">
+				if(checkFinishedLock)
+					return false;
+			</c:if>
+				
+			document.location.href = "<c:url value="/learning/start.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();				
+				
  		    return false;
 		}
 		function viewItem(itemUid){
@@ -103,9 +110,16 @@
 			<c:forEach var="item" items="${sessionMap.resourceList}">
 				<tr>
 					<td>
-						<a href="javascript:;" onclick="viewItem(${item.uid})">
-							${item.title} </a>
-
+						<c:choose>
+							<c:when test="${sessionMap.lockOnFinish and mode != 'teacher' and sessionMap.userFinished}">
+								${item.title}
+							</c:when>
+							<c:otherwise>
+								<a href="javascript:;" onclick="viewItem(${item.uid})">
+									${item.title} </a>
+							</c:otherwise>
+						</c:choose>
+						
 						<c:if test="${!item.createByAuthor && item.createBy != null}">
 								[${item.createBy.loginName}]
 							</c:if>