From a4a389a11f12b4124fba89987d1c5b33570a4bac Mon Sep 17 00:00:00 2001 From: David Webster Date: Thu, 29 Sep 2011 09:30:40 +0000 Subject: [PATCH] Fixes the events API so they return valid JSON. Fixes: ALF-10530 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30841 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/slingshot/calendar/event.get.json.ftl | 4 ++-- .../org/alfresco/slingshot/calendar/eventList.get.json.ftl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl index 6333592eee..5bba5c878a 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl @@ -11,12 +11,12 @@ "startAt": { "iso8601": "${xmldate(result.from)}", "legacyDate": "${result.from?string("M/d/yyyy")}", - "legacyTime": "${result.from?string("HH:mm")}", + "legacyTime": "${result.from?string("HH:mm")}" }, "endAt": { "iso8601": "${xmldate(result.to)}", "legacyDate": "${result.to?string("M/d/yyyy")}", - "legacyTime": "${result.to?string("HH:mm")}", + "legacyTime": "${result.to?string("HH:mm")}" }, "allday": "${result.allday?string}", diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.json.ftl index 6eafbdb321..d082b41f84 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.json.ftl @@ -19,12 +19,12 @@ "startAt": { "iso8601": "${xmldate(event.start)}", "legacyDate": "${event.start?string("M/d/yyyy")}", - "legacyTime": "${event.start?string("HH:mm")}", + "legacyTime": "${event.start?string("HH:mm")}" }, "endAt": { "iso8601": "${xmldate(event.end)}", "legacyDate": "${event.end?string("M/d/yyyy")}", - "legacyTime": "${event.end?string("HH:mm")}", + "legacyTime": "${event.end?string("HH:mm")}" }, "tags": [<#list item.tags as tag>"${tag}"<#if tag_has_next>,],