First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21960 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2010-08-24 10:21:40 +00:00
parent 60da75b178
commit 9564af6a2d
4 changed files with 25 additions and 28 deletions

View File

@@ -1,4 +1,4 @@
<#macro dateFormat date>${date?string("dd MMM yyyy HH:mm:ss 'GMT'Z '('zzz')'")}</#macro>
<#macro dateFormat date>${xmldate(date)}</#macro>
<#macro renderItem item>
<#escape x as jsonUtils.encodeJSONString(x)>
{
@@ -32,32 +32,29 @@
"blogPosts":
{
"items":
[
[
<#list data.blogPosts.items as item>
<@renderItem item />
<#if item_has_next>,</#if>
<@renderItem item /><#if item_has_next>,</#if>
</#list>
]
]
},
"wikiPages":
{
"items":
[
[
<#list data.wikiPages.items as item>
<@renderItem item />
<#if item_has_next>,</#if>
<@renderItem item /><#if item_has_next>,</#if>
</#list>
]
]
},
"forumPosts":
{
"items":
[
[
<#list data.discussions.items as item>
<@renderItem item />
<#if item_has_next>,</#if>
<@renderItem item /><#if item_has_next>,</#if>
</#list>
]
]
}
}
</#escape>

View File

@@ -9,7 +9,7 @@
"value": "${item.createdBy.userName}",
"displayValue": "${item.createdBy.displayName}"
},
"modifiedOn": "${xmldate(node.properties.modified)}>",
"modifiedOn": "${xmldate(node.properties.modified)}",
"modifiedBy":
{
"value": "${item.modifiedBy.userName}",

View File

@@ -1,17 +1,17 @@
<#macro dateFormat date>${date?string("dd MMM yyyy HH:mm:ss 'GMT'Z '('zzz')'")}</#macro>
<#macro dateFormat date>${xmldate(date)}</#macro>
<#escape x as jsonUtils.encodeJSONString(x)>
{
"items":
[
<#list images.items as item>
{
"name": "${(item.properties.name)}",
"title": "${(item.properties.title!item.name)}",
"modifier": "${(item.properties.modifier)}",
"modifiedOn": "<@dateFormat item.properties.modified />",
"nodeRef": "${item.nodeRef}"
}<#if item_has_next>,</#if>
</#list>
]
"items":
[
<#list images.items as item>
{
"name": "${(item.properties.name)}",
"title": "${(item.properties.title!item.name)}",
"modifier": "${(item.properties.modifier)}",
"modifiedOn": "<@dateFormat item.properties.modified />",
"nodeRef": "${item.nodeRef}"
}<#if item_has_next>,</#if>
</#list>
]
}
</#escape>

View File

@@ -1,6 +1,6 @@
<#assign workingCopyLabel = " " + message("coci_service.working_copy_label")>
<#macro dateFormat date>${date?string("dd MMM yyyy HH:mm:ss 'GMT'Z '('zzz')'")}</#macro>
<#macro dateFormat date>${xmldate(date)}</#macro>
<#macro itemJSON item>
<#escape x as jsonUtils.encodeJSONString(x)>