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

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
125333 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125215 bhorje: ACE-5308 set valid parent association qname 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125440 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-04-15 12:15:32 +00:00
parent f12308b25d
commit b6cc69db9b
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java
View File

@@ -817,9 +817,14 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension<Node
} }
NodeRef referenceNodeRef = reference.toNodeRef(); NodeRef referenceNodeRef = reference.toNodeRef();
Map<QName, Serializable> refProperties = smartStore.getProperties(reference);
Serializable childName = refProperties.get(ContentModel.PROP_NAME);
QName childAssocQName = QName
.createQNameWithValidLocalName(VirtualContentModel.VIRTUAL_CONTENT_MODEL_1_0_URI,
childName.toString());
ChildAssociationRef assoc = new ChildAssociationRef(ContentModel.ASSOC_CONTAINS, ChildAssociationRef assoc = new ChildAssociationRef(ContentModel.ASSOC_CONTAINS,
parentNodeRef, parentNodeRef,
NodeArchiveService.QNAME_ARCHIVED_ITEM, childAssocQName,
referenceNodeRef, referenceNodeRef,
true, true,
-1); -1);

3
source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java
View File

@@ -1032,6 +1032,9 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
NodeRef parentRef = primaryParent.getParentRef(); NodeRef parentRef = primaryParent.getParentRef();
assertEquals(virtualFolder1NodeRef, assertEquals(virtualFolder1NodeRef,
parentRef); parentRef);
assertEquals(QName
.createQNameWithValidLocalName(VirtualContentModel.VIRTUAL_CONTENT_MODEL_1_0_URI,
"Node2"),primaryParent.getQName());
// check that the primary parent node of level 2 virtual folder is his // check that the primary parent node of level 2 virtual folder is his
// virtual folder parent // virtual folder parent