From a7aa0d92f5de6bef5225e43e90fe572f67c38dd2 Mon Sep 17 00:00:00 2001
From: Mike Hatfield <mike.hatfield@alfresco.com>
Date: Tue, 30 Sep 2008 10:05:52 +0000
Subject: [PATCH] Activities refactor

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11095 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java  | 1 +
 source/java/org/alfresco/repo/site/SiteServiceImpl.java          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java b/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java
index 7131fa875a..72f57da50c 100644
--- a/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java
+++ b/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java
@@ -161,6 +161,7 @@ public class ActivityFeedDAO
     {
         JSONObject jo = new JSONObject();
         
+        jo.put("id", id);
         jo.put("postUserId", postUserId);
         jo.put("postDate", ISO8601DateFormat.format(postDate));
         if (feedUserId != null) { jo.put("feedUserId", feedUserId); } // eg. site feed
diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
index f31cc3429a..f9df543182 100644
--- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java
+++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
@@ -978,6 +978,7 @@ public class SiteServiceImpl implements SiteService, SiteModel
             activityData.put("role", role);
             activityData.put("memberFirstName", memberFN);
             activityData.put("memberLastName", memberLN);
+            activityData.put("title", (memberFN + " " + memberLN + " (" + userName + ")").trim());
             return activityData.toString();
         }
         catch (JSONException je)