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

Merged 3.2 to HEAD

Browse Source 
16820: Fix for ETHREEOH-2483 -  iCalendar feed and Timezone out of sync

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Lawrence Carvalho
2009-10-14 11:12:06 +00:00
parent 0f6006877f
commit e5730fce00
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.calendar.ftl
View File

@@ -1,6 +1,7 @@
<#if events?exists> <#if events?exists>
<#assign dateFormat = "yyyyMMdd"> <#assign dateFormat = "yyyyMMdd">
<#assign timeFormat = "HHmmss"> <#assign timeFormat = "HHmmss">
<#assign zoneFormat = "z">
BEGIN:VCALENDAR BEGIN:VCALENDAR
PRODID:-//Alfresco Software//Calendar 1.0//EN PRODID:-//Alfresco Software//Calendar 1.0//EN
VERSION:2.0 VERSION:2.0
@@ -11,10 +12,10 @@ VERSION:2.0
<#assign to = event.properties["ia:toDate"]> <#assign to = event.properties["ia:toDate"]>
BEGIN:VEVENT BEGIN:VEVENT
UID:${event.id} UID:${event.id}
DTSTART:${from?string(dateFormat)}T${from?string(timeFormat)}Z DTSTART;TZID=${from?string(zoneFormat)}:${from?string(dateFormat)}T${from?string(timeFormat)}
DTEND:${to?string(dateFormat)}T${to?string(timeFormat)}Z DTEND;TZID=${from?string(zoneFormat)}:${to?string(dateFormat)}T${to?string(timeFormat)}
SUMMARY:${event.properties["ia:whatEvent"]!""} SUMMARY:${event.properties["ia:whatEvent"]!""}
DTSTAMP:${event.properties["cm:created"]?string(dateFormat)}T${event.properties["cm:created"]?string(timeFormat)}Z DTSTAMP;TZID=${event.properties["cm:created"]?string(zoneFormat)}:${event.properties["cm:created"]?string(dateFormat)}T${event.properties["cm:created"]?string(timeFormat)}
<#if event.properties["ia:descriptionEvent"]?exists> <#if event.properties["ia:descriptionEvent"]?exists>
DESCRIPTION:${event.properties["ia:descriptionEvent"]?replace("\\", "\\\\")?replace(",", "\\,")?replace(";", "\\;")?replace("\r?\n", "\\n", "r")} DESCRIPTION:${event.properties["ia:descriptionEvent"]?replace("\\", "\\\\")?replace(",", "\\,")?replace(";", "\\;")?replace("\r?\n", "\\n", "r")}
</#if> </#if>