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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
100471: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100280: Fix to correctly handle root node (null parent qname reference) in ChildAssocRefWrapper for Admin Console scripts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-27 23:17:24 +00:00
parent 1d16fa63ab
commit f8a6393af4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java
View File

@@ -292,12 +292,14 @@ public class NodeBrowserPost extends NodeBrowserScript implements Serializable
public String getTypeQName()
{
return typeqname != null ? typeqname : (typeqname = ref.getTypeQName().toPrefixString(getNamespaceService()));
return typeqname != null ? typeqname : (
typeqname = ref.getTypeQName() != null ? ref.getTypeQName().toPrefixString(getNamespaceService()) : "");
}
public String getQName()
{
return qname != null ? qname : (qname = ref.getQName().toPrefixString(getNamespaceService()));
return qname != null ? qname : (
qname = ref.getQName() != null ? ref.getQName().toPrefixString(getNamespaceService()) : "");
}
public NodeRef getChildRef()