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

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
127602 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127342 jvonka: Node Associations - peer assoc permissions
      - alt impl using temp wrapper instead of full override
      RA-1062


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127694 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:48:43 +00:00
parent d812ec3601
commit a0b13ea954
6 changed files with 169 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/rest/api/nodes/AbstractNodeRelation.java
View File

@@ -69,6 +69,7 @@ public class AbstractNodeRelation implements InitializingBean
protected ServiceRegistry sr;
protected NodeService nodeService;
protected NodeAssocService nodeAssocService; // wraps initial Peer Assoc permissions
protected NamespaceService namespaceService;
protected DictionaryService dictionaryService;
protected Nodes nodes;
@@ -84,9 +85,9 @@ public class AbstractNodeRelation implements InitializingBean
}
// Introduces permissions for Node Assoc (see public-rest-context.xml)
public void setNodeService(NodeService nodeService)
public void setNodeAssocService(NodeAssocService nodeAssocService)
{
this.nodeService = nodeService;
this.nodeAssocService = nodeAssocService;
}
@Override
@@ -95,7 +96,7 @@ public class AbstractNodeRelation implements InitializingBean
PropertyCheck.mandatory(this, "serviceRegistry", sr);
ParameterCheck.mandatory("nodes", this.nodes);
//this.nodeService = sr.getNodeService();
this.nodeService = sr.getNodeService();
this.namespaceService = sr.getNamespaceService();
this.dictionaryService = sr.getDictionaryService();
}