Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r9cd921026b19a3669dc578d0ab274967e87e7fce -r4b73d76add981e24250409835fa9d3718c090110
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 9cd921026b19a3669dc578d0ab274967e87e7fce)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision 4b73d76add981e24250409835fa9d3718c090110)
@@ -157,7 +157,7 @@
 		sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER,content.getLimitUploadNumber());
 		sessionMap.put(SbmtConstants.ATTR_USER_FINISHED, learner.isFinished());
 		
-		setLearnerDTO(request, sessionMap, learner, filesUploaded);
+		setLearnerDTO(request, sessionMap, learner, filesUploaded, mode);
 		
 		//if content in use, return special page.
 		if(content.isDefineLater()){
@@ -211,7 +211,8 @@
 			List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
 
 			SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
-			setLearnerDTO(request,sessionMap, learner, filesUploaded);
+			ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+			setLearnerDTO(request,sessionMap, learner, filesUploaded, mode);
 			
 			return mapping.getInputForward();
 		}
@@ -233,8 +234,8 @@
 		submitFilesService.uploadFileToSession(sessionID,uploadedFile,fileDescription,userID);
 		List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
 		SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
-		
-		setLearnerDTO(request,sessionMap, learner, filesUploaded);
+		ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+		setLearnerDTO(request,sessionMap, learner, filesUploaded, mode);
 		return mapping.getInputForward();			
 	}
 
@@ -339,7 +340,7 @@
 	 * @param content
 	 * @param filesUploaded 
 	 */
-	private void setLearnerDTO(HttpServletRequest request, SessionMap sessionMap, SubmitUser currUser, List filesUploaded) {
+	private void setLearnerDTO(HttpServletRequest request, SessionMap sessionMap, SubmitUser currUser, List filesUploaded, ToolAccessMode mode) {
 		
 		SubmitUserDTO dto = new SubmitUserDTO(currUser);
 		if(currUser != null){
@@ -348,7 +349,7 @@
 				Iterator iter = filesUploaded.iterator();
 				while(iter.hasNext()){
 					FileDetailsDTO filedto = (FileDetailsDTO) iter.next();
-					if(currUser.getUid().equals(filedto.getOwner().getUserUid()))
+					if(mode.isTeacher() ||  currUser.getUid().equals(filedto.getOwner().getUserUid()))
 						filedto.setCurrentLearner(true);
 					else
 						filedto.setCurrentLearner(false);