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 
125247 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125138 bhorje: ACE-5306 added cm:titled aspect to virtual smart folder entries  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ramona Neamtu
2016-04-14 11:24:43 +00:00
parent 1302db3e38
commit fefddb593a
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension<Node
if (Reference.isReference(nodeRef)) if (Reference.isReference(nodeRef))
{ {
boolean isNodeProtocol = Reference.fromNodeRef(nodeRef).getProtocol().equals(Protocols.NODE.protocol); boolean isNodeProtocol = Reference.fromNodeRef(nodeRef).getProtocol().equals(Protocols.NODE.protocol);
if (VirtualContentModel.ASPECT_VIRTUAL.equals(aspectQName)) if (VirtualContentModel.ASPECT_VIRTUAL.equals(aspectQName) || ContentModel.ASPECT_TITLED.equals(aspectQName))
{ {
return !isNodeProtocol; return !isNodeProtocol;
} }

2
source/java/org/alfresco/repo/virtual/ref/GetAspectsMethod.java
View File

@@ -22,6 +22,7 @@ package org.alfresco.repo.virtual.ref;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.node.db.traitextender.NodeServiceTrait; import org.alfresco.repo.node.db.traitextender.NodeServiceTrait;
import org.alfresco.repo.virtual.ActualEnvironment; import org.alfresco.repo.virtual.ActualEnvironment;
import org.alfresco.repo.virtual.ActualEnvironmentException; import org.alfresco.repo.virtual.ActualEnvironmentException;
@@ -46,6 +47,7 @@ public class GetAspectsMethod extends AbstractProtocolMethod<Set<QName>>
{ {
Set<QName> aspects = new HashSet<QName>(); Set<QName> aspects = new HashSet<QName>();
aspects.add(VirtualContentModel.ASPECT_VIRTUAL); aspects.add(VirtualContentModel.ASPECT_VIRTUAL);
aspects.add(ContentModel.ASPECT_TITLED);
return aspects; return aspects;
} }

4
source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
View File

@@ -308,7 +308,9 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
assertTrue(nodeService.hasAspect(nodeRef, assertTrue(nodeService.hasAspect(nodeRef,
VirtualContentModel.ASPECT_VIRTUAL)); VirtualContentModel.ASPECT_VIRTUAL));
Set<QName> aspects = nodeService.getAspects(nodeRef); Set<QName> aspects = nodeService.getAspects(nodeRef);
assertTrue(aspects.contains(VirtualContentModel.ASPECT_VIRTUAL)); assertTrue("Smart virtual node missing virtual aspect",aspects.contains(VirtualContentModel.ASPECT_VIRTUAL));
//ACE-5303 injected properties title and description require the titled aspect
assertTrue("Smaft virtual node missing titled aspect",aspects.contains(ContentModel.ASPECT_TITLED));
Map<QName, Serializable> nodeProperties = nodeService.getProperties(nodeRef); Map<QName, Serializable> nodeProperties = nodeService.getProperties(nodeRef);