Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.420.2.105 -r1.420.2.106 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java,v diff -u -r1.4.2.6 -r1.4.2.7 --- lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java 9 Sep 2016 07:24:20 -0000 1.4.2.6 +++ lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java 14 Dec 2016 11:21:43 -0000 1.4.2.7 @@ -389,15 +389,17 @@ commentService = getCommentService(); User user = getCurrentUser(request); - if (!learnerInToolSession(externalId, user) && !monitorInToolSession(externalId, user, sessionMap)) { + ToolAccessMode mode = WebUtil.getToolAccessMode((String) sessionMap.get(AttributeNames.ATTR_MODE)); + boolean isMonitor = ToolAccessMode.TEACHER.equals(mode) && monitorInToolSession(externalId, user, sessionMap); + if (!isMonitor && !learnerInToolSession(externalId, user) ) { throwException("New comment: User does not have the rights to access the comments. ", user.getLogin(), externalId, externalType, externalSignature); } Comment rootSeq = commentService.getRoot(externalId, externalType, externalSignature); // save message into database - Comment newComment = commentService.createReply(rootSeq, commentText, user); + Comment newComment = commentService.createReply(rootSeq, commentText, user, isMonitor); JSONObject = new JSONObject(); JSONObject.put(CommentConstants.ATTR_COMMENT_ID, newComment.getUid()); @@ -455,15 +457,16 @@ } else { - commentService = getCommentService(); User user = getCurrentUser(request); - if (!learnerInToolSession(externalId, user) && !monitorInToolSession(externalId, user, sessionMap)) { + ToolAccessMode mode = WebUtil.getToolAccessMode((String) sessionMap.get(AttributeNames.ATTR_MODE)); + boolean isMonitor = ToolAccessMode.TEACHER.equals(mode) && monitorInToolSession(externalId, user, sessionMap); + if (!isMonitor && !learnerInToolSession(externalId, user) ) { throwException("New comment: User does not have the rights to access the comments. ", user.getLogin(), externalId, externalType, externalSignature); } // save message into database - Comment newComment = commentService.createReply(parentId, commentText.trim(), user); + Comment newComment = commentService.createReply(parentId, commentText.trim(), user, isMonitor); JSONObject = new JSONObject(); JSONObject.put(CommentConstants.ATTR_COMMENT_ID, newComment.getUid()); Index: lams_central/web/comments/comments.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/comments/comments.jsp,v diff -u -r1.6.2.10 -r1.6.2.11 --- lams_central/web/comments/comments.jsp 20 Aug 2016 03:46:28 -0000 1.6.2.10 +++ lams_central/web/comments/comments.jsp 14 Dec 2016 11:21:43 -0000 1.6.2.11 @@ -70,7 +70,7 @@ -
+
<%@ include file="allview.jsp"%>
Index: lams_central/web/comments/msgview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/comments/msgview.jsp,v diff -u -r1.4.2.8 -r1.4.2.9 --- lams_central/web/comments/msgview.jsp 23 Aug 2016 03:04:41 -0000 1.4.2.8 +++ lams_central/web/comments/msgview.jsp 14 Dec 2016 11:21:43 -0000 1.4.2.9 @@ -10,6 +10,7 @@ + @@ -21,7 +22,7 @@
-
px;"> +

@@ -33,25 +34,37 @@ + + + + + + + + + + - - + + + - - + + + - - + - | ()

-
+
Index: lams_central/web/comments/topicview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/comments/topicview.jsp,v diff -u -r1.5.2.8 -r1.5.2.9 --- lams_central/web/comments/topicview.jsp 23 Aug 2016 03:04:41 -0000 1.5.2.8 +++ lams_central/web/comments/topicview.jsp 14 Dec 2016 11:21:43 -0000 1.5.2.9 @@ -153,6 +153,8 @@ + + <%-- same test & command appears at bottom of script --%> @@ -165,7 +167,6 @@
-
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml 27 Apr 2016 00:06:40 -0000 1.1.2.3 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml 14 Dec 2016 11:22:59 -0000 1.1.2.4 @@ -145,6 +145,14 @@ column="sticky" /> + + Index: lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java 11 May 2016 07:07:26 -0000 1.1.2.5 +++ lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java 14 Dec 2016 11:22:59 -0000 1.1.2.6 @@ -53,6 +53,7 @@ private int replyNumber; private boolean hideFlag; private boolean sticky; + private boolean monitor; private Comment rootComment; private Comment threadComment; @@ -246,6 +247,14 @@ this.vote = vote; } + public boolean isMonitor() { + return monitor; + } + + public void setMonitor(boolean monitor) { + this.monitor = monitor; + } + @Override public String toString() { return new ToStringBuilder(this).append("uid", uid).append("body", body).toString(); Index: lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java,v diff -u -r1.3.2.5 -r1.3.2.6 --- lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java 11 May 2016 07:07:28 -0000 1.3.2.5 +++ lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java 14 Dec 2016 11:22:59 -0000 1.3.2.6 @@ -150,12 +150,13 @@ } @Override - public Comment createReply(Comment parent, String replyText, User user) { + public Comment createReply(Comment parent, String replyText, User user, boolean isMonitor) { Comment replyMessage = new Comment(); replyMessage.setBody(replyText); replyMessage.setHideFlag(false); replyMessage.updateModificationData(user); + replyMessage.setMonitor(isMonitor); replyMessage.setParent(parent); replyMessage.setSession(parent.getSession()); @@ -202,10 +203,10 @@ } @Override - public Comment createReply(Long parentId, String replyText, User user) { + public Comment createReply(Long parentId, String replyText, User user, boolean isMonitor) { Comment parent = commentDAO.getById(parentId); - return (createReply(parent, replyText, user)); + return (createReply(parent, replyText, user, isMonitor)); } Index: lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java,v diff -u -r1.2.2.5 -r1.2.2.6 --- lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java 11 May 2016 07:07:28 -0000 1.2.2.5 +++ lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java 14 Dec 2016 11:22:59 -0000 1.2.2.6 @@ -47,9 +47,9 @@ Integer sortBy, String extraSortParam, Integer userId); /** Saves a comment - either creating a whole tree one if there is no parent or saving under the given parent. */ - Comment createReply(Long parentId, String replyText, User user); + Comment createReply(Long parentId, String replyText, User user, boolean isMonitor); - Comment createReply(Comment parent, String replyText, User user); + Comment createReply(Comment parent, String replyText, User user, boolean isMonitor); /** Gets the dummy root for the comment system and if one doesn't exist for this session then set it up! */ Comment createOrGetRoot(Long externalId, Integer externalIdType, String externalSignature, User user); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040080.sql'. Fisheye: No comparison available. Pass `N' to diff?