Merge pull request sakaiproject#147 from lorenamgUMU/SAK-28070

SAK-28070 The new link 'Move Thread(s)' should only appear to those user...
yuyilin · Feb 9, 2015 · aa2118a · aa2118a
2 parents 11b17f0 + 219710c
commit aa2118a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp
@@ -266,7 +266,7 @@
 					<f:verbatim>
                         <a style="color:grey" class="display-topic-picker" id="msgForum:df_move_message_commandLink" onclick="resizeFrameForDialog();" href="#" >
 				    </f:verbatim>
-                    <h:outputText value="#{msgs.move_thread}" />
+                    <h:outputText rendered="#{ForumTool.selectedTopic.isMovePostings}" value="#{msgs.move_thread}" />
 					<f:verbatim></a></f:verbatim>
 					<f:verbatim></div></f:verbatim>
 

diff --git a/...pl/src/java/org/sakaiproject/component/app/messageforums/ui/UIPermissionsManagerImpl.java b/...pl/src/java/org/sakaiproject/component/app/messageforums/ui/UIPermissionsManagerImpl.java
@@ -394,7 +394,9 @@ public boolean isMovePostings(DiscussionTopic topic, DiscussionForum forum)
       while (iter.hasNext())
       {
         DBMembershipItem item = (DBMembershipItem) iter.next();
-        if (item.getPermissionLevel().getMovePosting().booleanValue()
+        if ((item.getPermissionLevel().getMovePosting().booleanValue()
+            || item.getPermissionLevel().getReviseAny().booleanValue()
+            || item.getPermissionLevel().getReviseOwn().booleanValue())
             && forum.getDraft().equals(Boolean.FALSE)
             && forum.getLocked().equals(Boolean.FALSE)
             && topic.getDraft().equals(Boolean.FALSE)