inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALF-9156 Correct site name in listing json, and add a unit test for that

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-07-14 16:38:34 +00:00
parent 44dbe4a189
commit 600abe7460
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl
View File

@@ -25,7 +25,7 @@
"start": "${event.start?string("HH:mm")}", "start": "${event.start?string("HH:mm")}",
"end": "${event.end?string("HH:mm")}", "end": "${event.end?string("HH:mm")}",
"site": "${event.site}", "site": "${event.siteName}",
"siteTitle": "${event.siteTitle}", "siteTitle": "${event.siteTitle}",
"allday": "${event.allday?string}", "allday": "${event.allday?string}",
"tags": [<#list event.tags as tag>"${tag}"<#if tag_has_next>,</#if></#list>], "tags": [<#list event.tags as tag>"${tag}"<#if tag_has_next>,</#if></#list>],

5
source/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java
View File

@@ -544,12 +544,15 @@ public class CalendarRestApiTest extends BaseWebScriptTest
// Check getting all of them // 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"); events = result.getJSONArray("events");
assertEquals(3, events.length()); assertEquals(3, events.length());
assertEquals(EVENT_TITLE_THREE, events.getJSONObject(0).getString("title")); assertEquals(EVENT_TITLE_THREE, events.getJSONObject(0).getString("title"));
assertEquals(EVENT_TITLE_ONE, events.getJSONObject(1).getString("title")); assertEquals(EVENT_TITLE_ONE, events.getJSONObject(1).getString("title"));
assertEquals(EVENT_TITLE_TWO, events.getJSONObject(2).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 // Now set a date filter to constrain