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 (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
96473: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96360: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96323: Reverse Merge V4.2-BUG-FIX (4.2.5)
            << Reverted as build has been broken for 4 days >>
            95704: Merged DEV to V4.2-BUG-FIX (4.2.5)
               94398: MNT-13234 : Duplicate activities in activities feed
                  - Changed getFollowers() method with implementing username case sensitive specific, like it done in getSiteMembers() method.
               94483: MNT-13234: Duplicate activities in activities feed
                  - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-02-07 10:32:52 +00:00
parent 34b24b7d07
commit 5331b3925d
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2015 Alfresco Software Limited. * Copyright (C) 2005-2012 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -371,7 +371,7 @@ public abstract class FeedTaskProcessor
{ {
try try
{ {
followerUsers = getFollowers(ctx, postUserId, tenantDomain); followerUsers = getFollowers(postUserId, tenantDomain);
} }
catch(Exception e) catch(Exception e)
{ {
@@ -525,7 +525,7 @@ public abstract class FeedTaskProcessor
return members; return members;
} }
protected abstract Set<String> getFollowers(RepoCtx ctx, String userId, String tenantDomain) throws Exception; protected abstract Set<String> getFollowers(String userId, String tenantDomain) throws Exception;
protected abstract boolean canReadSite(final RepoCtx ctx, String siteIdIn, String connectedUser, final String tenantDomain) throws Exception; protected abstract boolean canReadSite(final RepoCtx ctx, String siteIdIn, String connectedUser, final String tenantDomain) throws Exception;
protected abstract boolean canRead(RepoCtx ctx, final String connectedUser, Map<String, Object> model) throws Exception; protected abstract boolean canRead(RepoCtx ctx, final String connectedUser, Map<String, Object> model) throws Exception;

13
source/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskProcessor.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2015 Alfresco Software Limited. * Copyright (C) 2005-2013 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -600,7 +600,7 @@ public class LocalFeedTaskProcessor extends FeedTaskProcessor implements Applica
return documentPaths; return documentPaths;
} }
protected Set<String> getFollowers(final RepoCtx ctx, final String userId, String tenantDomain) throws Exception protected Set<String> getFollowers(final String userId, String tenantDomain) throws Exception
{ {
if (useRemoteCallbacks) if (useRemoteCallbacks)
{ {
@@ -620,14 +620,7 @@ public class LocalFeedTaskProcessor extends FeedTaskProcessor implements Applica
if (fr.getPage() != null) if (fr.getPage() != null)
{ {
for (String followerUserName : fr.getPage()) result.addAll(fr.getPage());
{
if (!ctx.isUserNamesAreCaseSensitive())
{
followerUserName = followerUserName.toLowerCase();
}
result.add(followerUserName);
}
} }
return null; return null;