Merged V3.2 to HEAD

17925: ETHREEOH-3798 - Transfer appears to longer work in the RM module
   17966: Fix for ETHREEOH-3766
    - Authority picker was hidden in the List-of-values Edit screen by an additional "hidden" class on the parent DIV that was not required

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18294 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2010-01-26 11:43:34 +00:00
parent 14f2bc306a
commit 7a2ce652e3

View File

@@ -41,19 +41,19 @@
<#assign version = "1.0">
<#if d.hasAspect("cm:versionable") && d.versionHistory?size != 0><#assign version = d.versionHistory[0].versionLabel></#if>
<#if item.createdBy??>
<#assign createdBy = (item.createdBy.properties.firstName!"" + " " + item.createdBy.properties.lastName!"")?trim>
<#assign createdBy = ((item.createdBy.properties.firstName!"") + " " + (item.createdBy.properties.lastName!""))?trim>
<#assign createdByUser = item.createdBy.properties.userName>
<#else>
<#assign createdBy="" createdByUser="">
</#if>
<#if item.modifiedBy??>
<#assign modifiedBy = (item.modifiedBy.properties.firstName!"" + " " + item.modifiedBy.properties.lastName!"")?trim>
<#assign modifiedBy = ((item.modifiedBy.properties.firstName!"") + " " + (item.modifiedBy.properties.lastName!""))?trim>
<#assign modifiedByUser = item.modifiedBy.properties.userName>
<#else>
<#assign modifiedBy="" modifiedByUser="">
</#if>
<#if item.lockedBy??>
<#assign lockedBy = (item.lockedBy.properties.firstName!"" + " " + item.lockedBy.properties.lastName!"")?trim>
<#assign lockedBy = ((item.lockedBy.properties.firstName!"") + " " + (item.lockedBy.properties.lastName!""))?trim>
<#assign lockedByUser = item.lockedBy.properties.userName>
<#else>
<#assign lockedBy="" lockedByUser="">