diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml index 395211d0b5..6e5c4237b9 100644 --- a/config/alfresco/web-scripts-application-context.xml +++ b/config/alfresco/web-scripts-application-context.xml @@ -1429,4 +1429,24 @@ parent="webscript"> - \ No newline at end of file + + + + + + + + + + + + + + + + + diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java b/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java index c44b5db8fd..d67127b70d 100644 --- a/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java @@ -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 executeImpl(SiteInfo site, String eventName, WebScriptRequest req, Status status, Cache cache); + } diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java index b65a08acef..c6beaa1c68 100644 --- a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java +++ b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java @@ -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; } }