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

ALF-9440 Remove the last of the old start/from/end/to entries from the calendar json, now that the webscripts have been updated to use startAt/legacyDate+legacyTime and endAt/legacyDate+legacyTime (moving soon to startAt/iso8601 and endAt/iso8601)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30504 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-09-14 11:16:06 +00:00
parent 072be2dde9
commit 36fdbf58cf
4 changed files with 48 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,13 +20,6 @@
},
"allday": "${result.allday?string}",
<#-- These are the old ones we'll get rid of soon -->
"from": "${result.from?string("M/d/yyyy")}",
"start": "${result.from?string("HH:mm")}",
"to": "${result.to?string("M/d/yyyy")}",
"end": "${result.to?string("HH:mm")}",
"docfolder": "${result.docfolder}",
"recurrence": "${result.recurrence}",
"isoutlook": "${result.isoutlook?string}"

6
config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.html.ftl
View File

@@ -21,12 +21,6 @@
},
"allday": "${result.allday?string}",
<#-- These are the old ones we'll get rid of soon -->
"from": "${result.from?string("yyyy-MM-dd")}",
"start": "${result.from?string("HH:mm")}",
"to": "${result.to?string("yyyy-MM-dd")}",
"end": "${result.to?string("HH:mm")}",
<#assign tags><#list result.tags as tag>"${tag}"<#if tag_has_next>,</#if></#list></#assign>
"tags": <#noescape>[${tags}]</#noescape>,
"docfolder": "${result.docfolder?html}"

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

@@ -27,12 +27,6 @@
"legacyTime": "${event.end?string("HH:mm")}",
},
<#-- These are the old ones we'll get rid of soon -->
"from": "${event.start?string("M/d/yyyy")}",
"start": "${event.start?string("HH:mm")}",
"to": "${event.end?string("M/d/yyyy")}",
"end": "${event.end?string("HH:mm")}",
"tags": [<#list item.tags as tag>"${tag}"<#if tag_has_next>,</#if></#list>],
<#if event.recurrenceRule??>
"recurrenceRule": "${event.recurrenceRule}",

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

@@ -375,10 +375,10 @@ public class CalendarRestApiTest extends BaseWebScriptTest
assertEquals(EVENT_TITLE_ONE, entry.getString("name"));
assertEquals("Where", entry.getString("where"));
assertEquals("Thing", entry.getString("desc"));
assertEquals("2011-06-29", entry.getString("from")); // Different format!
assertEquals("2011-06-29", entry.getString("to")); // Different format!
assertEquals("12:00", entry.getString("start"));
assertEquals("13:00", entry.getString("end"));
assertEquals("2011-06-29", entry.getJSONObject("startAt").getString("legacyDate")); // Different format!
assertEquals("2011-06-29", entry.getJSONObject("endAt").getString("legacyDate")); // Different format!
assertEquals("12:00", entry.getJSONObject("startAt").getString("legacyTime"));
assertEquals("13:00", entry.getJSONObject("endAt").getString("legacyTime"));
assertEquals("false", entry.getString("allday"));
// No isoutlook on create/edit
@@ -393,10 +393,10 @@ public class CalendarRestApiTest extends BaseWebScriptTest
assertEquals("Thing", entry.getString("description")); // Not desc...
assertEquals("false", entry.getString("isoutlook"));
assertEquals("6/29/2011", entry.getString("from"));
assertEquals("6/29/2011", entry.getString("to"));
assertEquals("12:00", entry.getString("start"));
assertEquals("13:00", entry.getString("end"));
assertEquals("6/29/2011", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("6/29/2011", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("12:00", entry.getJSONObject("startAt").getString("legacyTime"));
assertEquals("13:00", entry.getJSONObject("endAt").getString("legacyTime"));
assertEquals("false", entry.getString("allday"));
// Check the new style dates too
@@ -432,10 +432,10 @@ public class CalendarRestApiTest extends BaseWebScriptTest
assertEquals("More Thing", entry.getString("description"));
assertEquals("false", entry.getString("isoutlook"));
assertEquals("6/28/2011", entry.getString("from"));
assertEquals("6/28/2011", entry.getString("to"));
assertEquals("11:30", entry.getString("start"));
assertEquals("13:30", entry.getString("end"));
assertEquals("6/28/2011", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("6/28/2011", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("11:30", entry.getJSONObject("startAt").getString("legacyTime"));
assertEquals("13:30", entry.getJSONObject("endAt").getString("legacyTime"));
assertEquals("false", entry.getString("allday"));
@@ -455,10 +455,10 @@ public class CalendarRestApiTest extends BaseWebScriptTest
assertEquals("More Thing", entry.getString("description"));
assertEquals("false", entry.getString("isoutlook"));
assertEquals("6/28/2011", entry.getString("from"));
assertEquals("6/28/2011", entry.getString("to"));
assertEquals("11:30", entry.getString("start"));
assertEquals("13:30", entry.getString("end"));
assertEquals("6/28/2011", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("6/28/2011", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("11:30", entry.getJSONObject("startAt").getString("legacyTime"));
assertEquals("13:30", entry.getJSONObject("endAt").getString("legacyTime"));
assertEquals("false", entry.getString("allday"));
assertEquals(
"Occurs every 2 weeks on Wednesday, Friday, effective " +
@@ -503,10 +503,10 @@ public class CalendarRestApiTest extends BaseWebScriptTest
json.put("end", "12:00");
entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
assertEquals("2011-06-21", entry.getString("from"));
assertEquals("2011-06-21", entry.getString("to"));
assertEquals("11:00", entry.getString("start"));
assertEquals("12:00", entry.getString("end"));
assertEquals("2011-06-21", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("2011-06-21", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("11:00", entry.getJSONObject("startAt").getString("legacyTime"));
assertEquals("12:00", entry.getJSONObject("endAt").getString("legacyTime"));
assertEquals("false", entry.getString("allday"));
// Can't check iso8601 form as we don't know the TZ
@@ -519,10 +519,10 @@ public class CalendarRestApiTest extends BaseWebScriptTest
json.put("end", "12:00");
entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
assertEquals("2011-06-22", entry.getString("from"));
assertEquals("2011-06-22", entry.getString("to"));
assertEquals("10:00", entry.getString("start"));
assertEquals("12:00", entry.getString("end"));
assertEquals("2011-06-22", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("2011-06-22", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("10:00", entry.getJSONObject("startAt").getString("legacyTime"));
assertEquals("12:00", entry.getJSONObject("endAt").getString("legacyTime"));
assertEquals("false", entry.getString("allday"));
// Can't check iso8601 form as we don't know the TZ
@@ -534,10 +534,10 @@ public class CalendarRestApiTest extends BaseWebScriptTest
entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
// Check old style dates and times
assertEquals("2011-06-21", entry.getString("from"));
assertEquals("2011-06-21", entry.getString("to"));
assertEquals("11:30", entry.getString("start"));
assertEquals("12:45", entry.getString("end"));
assertEquals("2011-06-21", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("2011-06-21", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("11:30", entry.getJSONObject("startAt").getString("legacyTime"));
assertEquals("12:45", entry.getJSONObject("endAt").getString("legacyTime"));
assertEquals("false", entry.getString("allday"));
// Check new style dates and times
@@ -553,10 +553,10 @@ public class CalendarRestApiTest extends BaseWebScriptTest
entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
// Check old style dates and times
assertEquals("2011-06-22", entry.getString("from"));
assertEquals("2011-06-22", entry.getString("to"));
assertEquals("11:30", entry.getString("start"));
assertEquals("12:45", entry.getString("end"));
assertEquals("2011-06-22", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("2011-06-22", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("11:30", entry.getJSONObject("startAt").getString("legacyTime"));
assertEquals("12:45", entry.getJSONObject("endAt").getString("legacyTime"));
assertEquals("false", entry.getString("allday"));
// Check new style dates and times
@@ -575,10 +575,10 @@ public class CalendarRestApiTest extends BaseWebScriptTest
entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
// Check old style dates and times
assertEquals("2011-06-20", entry.getString("from"));
assertEquals("2011-06-20", entry.getString("to"));
assertEquals("09:35", entry.getString("start"));
assertEquals("10:35", entry.getString("end"));
assertEquals("2011-06-20", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("2011-06-20", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("09:35", entry.getJSONObject("startAt").getString("legacyTime"));
assertEquals("10:35", entry.getJSONObject("endAt").getString("legacyTime"));
assertEquals("false", entry.getString("allday"));
// Check new style dates and times
@@ -599,10 +599,10 @@ public class CalendarRestApiTest extends BaseWebScriptTest
entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
// Check old style dates and times
assertEquals("2011-06-24", entry.getString("from"));
assertEquals("2011-06-24", entry.getString("to"));
assertEquals("09:30", entry.getString("start"));
assertEquals("10:45", entry.getString("end"));
assertEquals("2011-06-24", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("2011-06-24", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("09:30", entry.getJSONObject("startAt").getString("legacyTime"));
assertEquals("10:45", entry.getJSONObject("endAt").getString("legacyTime"));
assertEquals("false", entry.getString("allday"));
// Check new style dates and times
@@ -617,10 +617,10 @@ public class CalendarRestApiTest extends BaseWebScriptTest
json.put("allday", Boolean.TRUE);
entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
assertEquals("2011-06-21", entry.getString("from"));
assertEquals("2011-06-21", entry.getString("to"));
assertEquals("00:00", entry.getString("start"));
assertEquals("00:00", entry.getString("end"));
assertEquals("2011-06-21", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("2011-06-21", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("00:00", entry.getJSONObject("startAt").getString("legacyTime"));
assertEquals("00:00", entry.getJSONObject("endAt").getString("legacyTime"));
assertEquals("true", entry.getString("allday"));
@@ -630,8 +630,8 @@ public class CalendarRestApiTest extends BaseWebScriptTest
json.put("endAt", "2011-06-21T00:00:00+01:00");
json.put("allday", Boolean.TRUE);
assertEquals("2011-06-21", entry.getString("from"));
assertEquals("2011-06-21", entry.getString("to"));
assertEquals("2011-06-21", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("2011-06-21", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("true", entry.getString("allday"));
@@ -643,8 +643,8 @@ public class CalendarRestApiTest extends BaseWebScriptTest
json.put("allday", Boolean.TRUE);
entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
assertEquals("2011-06-22", entry.getString("from"));
assertEquals("2011-06-22", entry.getString("to"));
assertEquals("2011-06-22", entry.getJSONObject("startAt").getString("legacyDate"));
assertEquals("2011-06-22", entry.getJSONObject("endAt").getString("legacyDate"));
assertEquals("true", entry.getString("allday"));
}