mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
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
This commit is contained in:
@@ -34,15 +34,6 @@
|
|||||||
"type" : "${object.type}"
|
"type" : "${object.type}"
|
||||||
,
|
,
|
||||||
"isCategory" : ${object.isCategory?string}
|
"isCategory" : ${object.isCategory?string}
|
||||||
,
|
|
||||||
|
|
||||||
<#if object.children?exists>
|
|
||||||
<#if object.children?size > 0>
|
|
||||||
"hasChildren" : true
|
|
||||||
<#else>
|
|
||||||
"hasChildren" : false
|
|
||||||
</#if>
|
|
||||||
</#if>
|
|
||||||
|
|
||||||
<#if object.properties?exists>
|
<#if object.properties?exists>
|
||||||
,
|
,
|
||||||
@@ -52,28 +43,20 @@
|
|||||||
<#list object.properties?keys as key>
|
<#list object.properties?keys as key>
|
||||||
<#if object.properties[key]?exists>
|
<#if object.properties[key]?exists>
|
||||||
<#assign val = object.properties[key]>
|
<#assign val = object.properties[key]>
|
||||||
<#if includeContent && object.isTemplateContent(val)>
|
<#if isUser && object.isTemplateContent(val)>
|
||||||
<#if first == false>
|
<#if first == false>,</#if>
|
||||||
,
|
|
||||||
</#if>
|
|
||||||
"${key}" : "${val.content?js_string}"
|
"${key}" : "${val.content?js_string}"
|
||||||
<#assign first = false>
|
<#assign first = false>
|
||||||
<#elseif val?is_string == true>
|
<#elseif val?is_string == true>
|
||||||
<#if first == false>
|
<#if first == false>,</#if>
|
||||||
,
|
|
||||||
</#if>
|
|
||||||
"${key}" : "${val?js_string}"
|
"${key}" : "${val?js_string}"
|
||||||
<#assign first = false>
|
<#assign first = false>
|
||||||
<#elseif val?is_date == true>
|
<#elseif val?is_date == true>
|
||||||
<#if first == false>
|
<#if first == false>,</#if>
|
||||||
,
|
|
||||||
</#if>
|
|
||||||
"${key}" : "${val?datetime}"
|
"${key}" : "${val?datetime}"
|
||||||
<#assign first = false>
|
<#assign first = false>
|
||||||
<#elseif val?is_boolean == true>
|
<#elseif val?is_boolean == true>
|
||||||
<#if first == false>
|
<#if first == false>,</#if>
|
||||||
,
|
|
||||||
</#if>
|
|
||||||
"${key}" : "${val}"
|
"${key}" : "${val}"
|
||||||
<#assign first = false>
|
<#assign first = false>
|
||||||
</#if>
|
</#if>
|
||||||
@@ -102,4 +85,12 @@
|
|||||||
"children" : []
|
"children" : []
|
||||||
</#if>
|
</#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>
|
</#macro>
|
@@ -1,5 +1,6 @@
|
|||||||
model.includeChildren = true;
|
model.includeChildren = true;
|
||||||
model.includeContent = false;
|
model.includeContent = false;
|
||||||
|
model.isUser = false;
|
||||||
|
|
||||||
var object = null;
|
var object = null;
|
||||||
|
|
||||||
@@ -17,7 +18,8 @@ else if(args["user"] != null)
|
|||||||
if (userId == person.properties.userName || people.isAdmin(person))
|
if (userId == person.properties.userName || people.isAdmin(person))
|
||||||
{
|
{
|
||||||
object = person;
|
object = person;
|
||||||
model.includeContent = true;
|
model.isUser = true;
|
||||||
|
model.includeChildren = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user