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

Activities refactor

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11095 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2008-09-30 10:05:52 +00:00
parent 3279b3133a
commit a7aa0d92f5
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java
View File

@@ -161,6 +161,7 @@ public class ActivityFeedDAO
{ {
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put("id", id);
jo.put("postUserId", postUserId); jo.put("postUserId", postUserId);
jo.put("postDate", ISO8601DateFormat.format(postDate)); jo.put("postDate", ISO8601DateFormat.format(postDate));
if (feedUserId != null) { jo.put("feedUserId", feedUserId); } // eg. site feed if (feedUserId != null) { jo.put("feedUserId", feedUserId); } // eg. site feed

1
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -978,6 +978,7 @@ public class SiteServiceImpl implements SiteService, SiteModel
activityData.put("role", role); activityData.put("role", role);
activityData.put("memberFirstName", memberFN); activityData.put("memberFirstName", memberFN);
activityData.put("memberLastName", memberLN); activityData.put("memberLastName", memberLN);
activityData.put("title", (memberFN + " " + memberLN + " (" + userName + ")").trim());
return activityData.toString(); return activityData.toString();
} }
catch (JSONException je) catch (JSONException je)