From 600abe7460e5d5236c84809032285b93fdefdf39 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Thu, 14 Jul 2011 16:38:34 +0000 Subject: [PATCH] ALF-9156 Correct site name in listing json, and add a unit test for that git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/slingshot/calendar/userevents.get.json.ftl | 2 +- .../repo/web/scripts/calendar/CalendarRestApiTest.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl index dc8da96d47..7599444728 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl @@ -25,7 +25,7 @@ "start": "${event.start?string("HH:mm")}", "end": "${event.end?string("HH:mm")}", - "site": "${event.site}", + "site": "${event.siteName}", "siteTitle": "${event.siteTitle}", "allday": "${event.allday?string}", "tags": [<#list event.tags as tag>"${tag}"<#if tag_has_next>,], diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java index a001bcc48f..63e5e93f23 100644 --- a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java +++ b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java @@ -544,12 +544,15 @@ public class CalendarRestApiTest extends BaseWebScriptTest // Check getting all of them - result = getEntries("admin", "2000/01/01"); // TODO From date shouldn't be needed... + result = getEntries("admin", null); events = result.getJSONArray("events"); assertEquals(3, events.length()); assertEquals(EVENT_TITLE_THREE, events.getJSONObject(0).getString("title")); assertEquals(EVENT_TITLE_ONE, events.getJSONObject(1).getString("title")); assertEquals(EVENT_TITLE_TWO, events.getJSONObject(2).getString("title")); + assertEquals(SITE_SHORT_NAME_CALENDAR, events.getJSONObject(0).getString("site")); + assertEquals(SITE_SHORT_NAME_CALENDAR, events.getJSONObject(1).getString("site")); + assertEquals(SITE_SHORT_NAME_CALENDAR, events.getJSONObject(2).getString("site")); // Now set a date filter to constrain