From e353ed8f0a0800e997e5f51827e44c60c49fce29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BC?= Date: Sat, 25 Jun 2011 19:23:56 +0000 Subject: [PATCH] Activities Dashlet: made activities filter work git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../activities/feed/UserFeedRetrieverWebScript.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java b/source/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java index 3f4e7c5869..0effdc6d51 100644 --- a/source/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java @@ -132,7 +132,14 @@ public class UserFeedRetrieverWebScript extends DeclarativeWebScript String[] activities = activityFilterStr.split(","); 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 { - List feedEntries = activityService.getUserFeedEntries(feedUserId, format, siteId, exclThisUser, exclOtherUsers); + List feedEntries = activityService.getUserFeedEntries(feedUserId, format, siteId, exclThisUser, exclOtherUsers, userFilter, activityFilter); if (format.equals(FeedTaskProcessor.FEED_FORMAT_JSON)) {