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

ALF-10318 Update CalendarEntry to hold the created and modified at dates

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-09-19 12:56:01 +00:00
parent fb406b769b
commit eced94e231
5 changed files with 88 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/java/org/alfresco/repo/calendar/CalendarServiceImpl.java
View File

@@ -39,6 +39,7 @@ import org.alfresco.repo.node.getchildren.GetChildrenCannedQuery;
import org.alfresco.repo.node.getchildren.GetChildrenCannedQueryFactory;
import org.alfresco.repo.site.SiteServiceImpl;
import org.alfresco.service.cmr.calendar.CalendarEntry;
import org.alfresco.service.cmr.calendar.CalendarEntryDTO;
import org.alfresco.service.cmr.calendar.CalendarService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
@@ -143,6 +144,10 @@ public class CalendarServiceImpl implements CalendarService
}
NodeRef event = nodeService.getChildByName(container, ContentModel.ASSOC_CONTAINS, entryName);
return getCalendarEntry(event, entryName, container);
}
private CalendarEntry getCalendarEntry(NodeRef event, String entryName, NodeRef container)
{
if (event != null)
{
CalendarEntryImpl entry = new CalendarEntryImpl(event, container, entryName);
@@ -196,6 +201,11 @@ public class CalendarServiceImpl implements CalendarService
entryImpl.setTags(entry.getTags());
}
// Set the auditable properties on it
Date createdAt = (Date)nodeService.getProperty(nodeRef, ContentModel.PROP_CREATED);
entryImpl.setCreatedAt(createdAt);
entryImpl.setModifiedAt(createdAt);
// Tag it
taggingService.setTags(nodeRef, entry.getTags());
@@ -230,8 +240,22 @@ public class CalendarServiceImpl implements CalendarService
// Update the tags
taggingService.setTags(entry.getNodeRef(), entry.getTags());
// Nothing was changed on the entry itself
return entry;
// Update the auditable properties
if(entry instanceof CalendarEntryDTO)
{
((CalendarEntryDTO)entry).setModifiedAt(
(Date)nodeService.getProperty(entry.getNodeRef(), ContentModel.PROP_MODIFIED)
);
// Return the same object
return entry;
}
else
{
// Need to change the modified date, but we can't
// Re-fetch to pick up the change
return getCalendarEntry(entry.getNodeRef(), entry.getSystemName(), entry.getContainerNodeRef());
}
}
@Override