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

Merged V3.3-BUG-FIX to HEAD

Browse Source 
22544: Merged V3.3 to V3.3-BUG-FIX
      22542: Fix for ALF-4090 - Added support for multi-value props, number and xml date to web-framework meta-data webscripts (used to retrieve user properties by Share).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-09-15 10:40:37 +00:00
parent 0d9abb7bde
commit 89207c5f0a
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl
View File

@@ -95,6 +95,22 @@
</#escape> </#escape>
</#macro> </#macro>
<#macro serializeSequence sequence>
[
<#local first = true>
<#list sequence as e>
<#if !first>,<#else><#local first = false></#if>
<#if isUser && object.isTemplateContent(e)>"${e.content}"
<#elseif object.isTemplateNodeRef(e)>"${e.nodeRef}"
<#elseif e?is_date>"${xmldate(e)}"
<#elseif e?is_boolean>${e?string}
<#elseif e?is_number>${e?c}
<#else>"${e}"
</#if>
</#list>
]
</#macro>
<#macro serializeHash hash> <#macro serializeHash hash>
<#escape x as jsonUtils.encodeJSONString(x)> <#escape x as jsonUtils.encodeJSONString(x)>
<#local first = true> <#local first = true>
@@ -106,6 +122,8 @@
<#elseif object.isTemplateNodeRef(val)>"${val.nodeRef}" <#elseif object.isTemplateNodeRef(val)>"${val.nodeRef}"
<#elseif val?is_date>"${xmldate(val)}" <#elseif val?is_date>"${xmldate(val)}"
<#elseif val?is_boolean>${val?string} <#elseif val?is_boolean>${val?string}
<#elseif val?is_number>${val?c}
<#elseif val?is_sequence><@serializeSequence sequence=val/>
<#else>"${val}" <#else>"${val}"
</#if> </#if>
</#if> </#if>