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

Activities Dashlet: made activities filter work

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Florian Mü
2011-06-25 19:23:56 +00:00
parent 0a61f72c15
commit e353ed8f0a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java
View File

@@ -132,7 +132,14 @@ public class UserFeedRetrieverWebScript extends DeclarativeWebScript
String[] activities = activityFilterStr.split(","); String[] activities = activityFilterStr.split(",");
for (String s : activities) for (String s : activities)
{ {
activityFilter.add(s); if (s.trim().length() > 0)
{
activityFilter.add(s.trim());
}
}
if (activityFilter.size() == 0)
{
activityFilter = null;
} }
} }
@@ -153,7 +160,7 @@ public class UserFeedRetrieverWebScript extends DeclarativeWebScript
try try
{ {
List<String> feedEntries = activityService.getUserFeedEntries(feedUserId, format, siteId, exclThisUser, exclOtherUsers); List<String> feedEntries = activityService.getUserFeedEntries(feedUserId, format, siteId, exclThisUser, exclOtherUsers, userFilter, activityFilter);
if (format.equals(FeedTaskProcessor.FEED_FORMAT_JSON)) if (format.equals(FeedTaskProcessor.FEED_FORMAT_JSON))
{ {