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 
126450 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122127 jvonka: Nodes (FileFolder) API - update/add -ve tests for move & copy operations
      - also fix-up error messages to show nodeId (rather than full nodeRef)
      RA-684, RA-806


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:22:31 +00:00
parent 1c7a2ac93c
commit 5b8acc631d
5 changed files with 120 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/rest/api/nodes/NodesEntityResource.java
View File

@@ -134,14 +134,14 @@ public class NodesEntityResource implements
@WebApiDescription(title = "Copy Node", description="Copy one or more nodes (files or folders) to a new target folder, with option to rename.")
public Node copyById(String nodeId, NodeTarget target, Parameters parameters)
{
return nodes.copyNode(nodeId, target.getTargetParentId(), target.getName(), parameters);
return nodes.moveOrCopyNode(nodeId, target.getTargetParentId(), target.getName(), parameters, true);
}
@Operation("move")
@WebApiDescription(title = "Move Node", description="Moves one or more nodes (files or folders) to a new target folder, with option to rename.")
public Node moveById(String nodeId, NodeTarget target, Parameters parameters)
{
return nodes.moveNode(nodeId, target.getTargetParentId(), target.getName(), parameters);
return nodes.moveOrCopyNode(nodeId, target.getTargetParentId(), target.getName(), parameters, false);
}
}