From d7377a2965233e48b7a1dbe0909b4ccab7cef464 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 14 Mar 2014 17:03:57 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    63819:
  Merged DEV to HEAD-BUG-FIX (4.3.0.BF)       63695: ACE-772: Topics from the
 sites the user is not a member of are displayed in My Discussions dashlet.   
      - Fixed incorrect display of topics into "My Discussions" dashlet.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../AbstractDiscussionWebScript.java          | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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..2901082a30 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<Map<String,Object>> items = new ArrayList<Map<String,Object>>();
        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 (site == null)
+          {
+             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);