diff --git a/source/java/org/alfresco/repo/web/scripts/discussion/AbstractDiscussionWebScript.java b/source/java/org/alfresco/repo/web/scripts/discussion/AbstractDiscussionWebScript.java index 2fe83357ac..99f181d0cd 100644 --- a/source/java/org/alfresco/repo/web/scripts/discussion/AbstractDiscussionWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/discussion/AbstractDiscussionWebScript.java @@ -403,7 +403,24 @@ public abstract class AbstractDiscussionWebScript extends DeclarativeWebScript List> items = new ArrayList>(); for (TopicInfo topic : topics) { - items.add(renderTopic(topic, site)); + // ACE-772 fix of incorrect display of topics into "My Discussions" dashlet. + // Into "My Discussions" dashlet forum topic will be displayed only if user is a member of that site. + if (null == site && null != topic.getShortSiteName()) + { + String currentUser = AuthenticationUtil.getFullyAuthenticatedUser(); + String siteShortName = topic.getShortSiteName(); + boolean isSiteMember = siteService.isMember(siteShortName, currentUser); + + if (isSiteMember) + { + items.add(renderTopic(topic, site)); + } + } + // Display all topics on the forum of the site. + else + { + items.add(renderTopic(topic, site)); + } } model.put("items", items);