inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1-A to HEAD

Browse Source 
8289: Added jpeg2000 mimetype
   8302: Fix for Adobe (ACT 1487)
   8306: Solution for Adobe raised ticket ACT 1384
   8310: Fix for location based breadcrumb when navigating discussions
   8432: ADB-48 - in case of multi-domain lookup, also consistent with AWC LoginBean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-05-19 14:09:30 +00:00
parent bf1525088b
commit 7eaddae91f
6 changed files with 78 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java
View File

@@ -718,7 +718,7 @@ public abstract class BaseAssociationEditor extends UIInput
if (ContentModel.TYPE_PERSON.equals(nodeService.getType(targetRef)))
{
out.write(Utils.encode(User.getFullName(nodeService, targetRef)));
out.write(Utils.encode(User.getFullNameAndUserId(nodeService, targetRef)));
}
else if (ContentModel.TYPE_AUTHORITY_CONTAINER.equals(nodeService.getType(targetRef)))
{
@@ -843,14 +843,14 @@ public abstract class BaseAssociationEditor extends UIInput
{
if (ContentModel.TYPE_PERSON.equals(nodeService.getType(item)))
{
// if the node represents a person, show the username instead of the name
// if the node represents a person, show the full name and userid instead of the name
String userName = (String)nodeService.getProperty(item, ContentModel.PROP_USERNAME);
if (userName != null && (userName.equals(PermissionService.GUEST_AUTHORITY) == false))
{
out.write("<option value='");
out.write(item.toString());
out.write("'>");
out.write(Utils.encode(User.getFullName(nodeService, item)));
out.write(Utils.encode(User.getFullNameAndUserId(nodeService, item)));
out.write("</option>");
}
}

2
source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
View File

@@ -171,7 +171,7 @@ public class UIAssociationEditor extends BaseAssociationEditor
if (ContentModel.TYPE_PERSON.equals(nodeService.getType(targetNode)))
{
// if the node represents a person, show the username instead of the name
out.write(Utils.encode(User.getFullName(nodeService, targetNode)));
out.write(Utils.encode(User.getFullNameAndUserId(nodeService, targetNode)));
}
else if (ContentModel.TYPE_AUTHORITY_CONTAINER.equals(nodeService.getType(targetNode)))
{