From 3e3f90ee776408e73bcd5703177bb13b64d70f80 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Mon, 21 Jul 2008 14:43:05 +0000
Subject: [PATCH] User Profile component:  - Read only view mode  - View/Edit
 screen switching  - User Avatar now returned as noderef in person meta-data
 call  - User Avatar displayed (via proxy) if present in person data

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9957 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../webframework/metadata.get.html.ftl        | 35 +++++++------------
 .../org/alfresco/webframework/metadata.get.js |  4 ++-
 2 files changed, 16 insertions(+), 23 deletions(-)

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 46953da348..d291d46db5 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
@@ -34,15 +34,6 @@
 	"type" : "${object.type}"
 	,
 	"isCategory" : ${object.isCategory?string}
-	,
-	
-<#if object.children?exists>
-	<#if object.children?size &gt; 0>
-		"hasChildren" : true
-	<#else>
-		"hasChildren" : false
-	</#if>
-</#if>
 	
 <#if object.properties?exists>
 	,
@@ -52,28 +43,20 @@
 	<#list object.properties?keys as key>
 		<#if object.properties[key]?exists>
 			<#assign val = object.properties[key]>
-			<#if includeContent && object.isTemplateContent(val)>
-				<#if first == false>
-					,
-				</#if>
+			<#if isUser && object.isTemplateContent(val)>
+				<#if first == false>,</#if>
 				"${key}" : "${val.content?js_string}"
 				<#assign first = false>
 			<#elseif val?is_string == true>
-				<#if first == false>
-					,
-				</#if>
+				<#if first == false>,</#if>
 				"${key}" : "${val?js_string}"
 				<#assign first = false>
 			<#elseif val?is_date == true>
-				<#if first == false>
-					,
-				</#if>
+				<#if first == false>,</#if>
 				"${key}" : "${val?datetime}"
 				<#assign first = false>
 			<#elseif val?is_boolean == true>
-				<#if first == false>
-					,
-				</#if>
+				<#if first == false>,</#if>
 				"${key}" : "${val}"
 				<#assign first = false>
 			</#if>
@@ -102,4 +85,12 @@
 	"children" : []
 </#if>
 
+<#if isUser && object.associations["cm:avatar"]?exists>
+	,
+	"associations" :
+	{
+		"{http://www.alfresco.org/model/content/1.0}avatar" : ["${object.associations["cm:avatar"][0].nodeRef}"]
+	}
+</#if>
+
 </#macro>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js b/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js
index a2bebbcf19..7597ba5e47 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js
@@ -1,5 +1,6 @@
 model.includeChildren = true;
 model.includeContent = false;
+model.isUser = false;
 
 var object = null;
 
@@ -17,7 +18,8 @@ else if(args["user"] != null)
 	if (userId == person.properties.userName || people.isAdmin(person))
 	{
 	   object = person;
-	   model.includeContent = true;
+	   model.isUser = true;
+	   model.includeChildren = false;
 	}
 }