ALF-9156 Flesh out more of the Calendar API, and start on using it for the rest API

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-07-06 15:55:15 +00:00
parent ba537fe43e
commit 5c1e37bb5c
3 changed files with 27 additions and 11 deletions

View File

@@ -21,7 +21,6 @@ package org.alfresco.repo.web.scripts.calendar;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.repo.model.Repository;
import org.alfresco.service.cmr.calendar.CalendarService;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.site.SiteInfo;
@@ -38,16 +37,10 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
public abstract class AbstractCalendarWebScript extends DeclarativeWebScript
{
// Injected services
protected Repository repository;
protected NodeService nodeService;
protected SiteService siteService;
protected CalendarService calendarService;
public void setRepository(Repository repository)
{
this.repository = repository;
}
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
@@ -108,4 +101,5 @@ public abstract class AbstractCalendarWebScript extends DeclarativeWebScript
protected abstract Map<String, Object> executeImpl(SiteInfo site,
String eventName, WebScriptRequest req, Status status, Cache cache);
}

View File

@@ -23,6 +23,7 @@ import java.util.Map;
import org.alfresco.repo.model.Repository;
import org.alfresco.service.cmr.calendar.CalendarEntry;
import org.alfresco.service.cmr.calendar.CalendarEntryDTO;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
@@ -59,10 +60,11 @@ public class CalendarEntryGet extends AbstractCalendarWebScript
model.put("from", entry.getStart());
model.put("to", entry.getEnd());
model.put("tags", entry.getTags());
model.put("allday", null); // TODO
model.put("docfolder", null); // TODO
model.put("isoutlook", entry.isOutlook());
model.put("outlookuid", entry.getOutlookUID());
model.put("allday", CalendarEntryDTO.isAllDay(entry));
model.put("recurrence", null); // TODO
model.put("isoutlook", null); // TODO
model.put("docfolder", null); // TODO
return model;
}
}