Merged BRANCHES/DEV/TAKSOY/SEARCHDASHLET to HEAD

36156: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/TAKSOY/SEARCHDASHLET
      35320: Fix to issue where 'Avatar' alt text was shown rather than user avatar in the Site Members (colleagues) dashlet.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36160 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2012-05-08 13:56:06 +00:00
parent e3f83803c7
commit 554deab8bd

View File

@@ -24,8 +24,8 @@
"firstName": "${authority.properties.firstName!""}",
"lastName": "${authority.properties.lastName!""}",
<#if authority.assocs["cm:avatar"]??>
<#assign avatarNodeRef>${authority.assocs["cm:avatar"][0].nodeRef?string?replace('://','/')}</#assign>
"avatar": "${"api/node/" + avatarNodeRef + "/content/thumbnails/avatar"}",
<#assign avatarNodeRef=authority.assocs["cm:avatar"][0].nodeRef?string/>
"avatar": "api/node/${avatarNodeRef?replace('://','/')}/content/thumbnails/avatar",
"avatarNode": "${avatarNodeRef}",
</#if>
<#if authority.properties.jobtitle??>