From 89207c5f0aeede923deef937fee5d637f5187a3d Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Wed, 15 Sep 2010 10:40:37 +0000 Subject: [PATCH] Merged V3.3-BUG-FIX to HEAD 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 --- .../webframework/metadata.get.html.ftl | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl index f641b4132e..aaf0d64ad3 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl @@ -64,7 +64,7 @@ { <@serialize object=child includeChildren=false includeContent=includeContent/> } - <#assign first = false> + <#assign first = false> ] <#else> @@ -95,6 +95,22 @@ +<#macro serializeSequence sequence> +[ +<#local first = true> +<#list sequence as e> + <#if !first>,<#else><#local first = false> + <#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}" + + +] + + <#macro serializeHash hash> <#escape x as jsonUtils.encodeJSONString(x)> <#local first = true> @@ -106,6 +122,8 @@ <#elseif object.isTemplateNodeRef(val)>"${val.nodeRef}" <#elseif val?is_date>"${xmldate(val)}" <#elseif val?is_boolean>${val?string} + <#elseif val?is_number>${val?c} + <#elseif val?is_sequence><@serializeSequence sequence=val/> <#else>"${val}"