From 8c22b5885ead423cf1985152be5684ae5e861213 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 14 Mar 2014 17:04:54 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 63888: Reverse merge << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEHEAD0-197, https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEHEAD0-198 >> 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@64331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../AbstractDiscussionWebScript.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) 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 2901082a30..2fe83357ac 100644 --- a/source/java/org/alfresco/repo/web/scripts/discussion/AbstractDiscussionWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/discussion/AbstractDiscussionWebScript.java @@ -403,24 +403,7 @@ public abstract class AbstractDiscussionWebScript extends DeclarativeWebScript List> items = new ArrayList>(); for (TopicInfo topic : topics) { - // 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)); - } + items.add(renderTopic(topic, site)); } model.put("items", items);