inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis
2014-03-14 17:04:54 +00:00
parent d7377a2965
commit 8c22b5885e
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/web/scripts/discussion/AbstractDiscussionWebScript.java
View File

@@ -403,24 +403,7 @@ public abstract class AbstractDiscussionWebScript extends DeclarativeWebScript
List<Map<String,Object>> items = new ArrayList<Map<String,Object>>();
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);