Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
diff -u -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 -r4a41d331564ffe353364cb8eb7ade1c817b3c6a7
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision f393908c737e5401dda3b995bacb6e4c4a5e5a50)
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision 4a41d331564ffe353364cb8eb7ade1c817b3c6a7)
@@ -48,9 +48,19 @@
 							</tr>
 							<tr>
 								<td colspan="2">
-									<a href="javascript:history.back();" class="button">
-										<fmt:message key="label.cancel" />
-									</a>
+									<c:if test="${updateMode == 'listMark'}">
+										<c:set var="cancelUrl">
+											<c:url value="/monitoring.do"/>?method=listMark&userID=${fileInfo.owner.userID}&toolSessionID=${toolSessionID}
+										</c:set>
+									</c:if>
+									<c:if test="${updateMode == 'listAllMarks'}">
+										<c:set var="cancelUrl">
+											<c:url value="/monitoring.do"/>?method=listAllMarks&toolSessionID=${toolSessionID}
+										</c:set>
+									</c:if>
+										<a href="${cancelUrl}" class="button">
+											<fmt:message key="label.cancel" />
+										</a>
 									&nbsp;&nbsp;
 									<a href="javascript:document.getElementById('updateMarkForm').submit();" class="button">
 										<fmt:message key="label.monitoring.saveMarks.button" />