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 
126599 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124903 gjames: RA-850 Purge Deleted Node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:14:50 +00:00
parent c0a435be1a
commit cb22f40e35
4 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java
View File

@@ -50,7 +50,7 @@ import java.util.List;
*/
@EntityResource(name="deleted-nodes", title = "Deleted Nodes")
public class TrashcanEntityResource implements
EntityResourceAction.ReadById<Node>, EntityResourceAction.Read<Node>
EntityResourceAction.ReadById<Node>, EntityResourceAction.Read<Node>, EntityResourceAction.Delete
{
private DeletedNodes deletedNodes;
@@ -66,9 +66,9 @@ public class TrashcanEntityResource implements
}
@Override
public Node readById(String id, Parameters parameters) throws EntityNotFoundException
public Node readById(String nodeId, Parameters parameters) throws EntityNotFoundException
{
return deletedNodes.getDeletedNode(id, parameters);
return deletedNodes.getDeletedNode(nodeId, parameters);
}
@Operation("restore")
@@ -77,4 +77,10 @@ public class TrashcanEntityResource implements
{
return deletedNodes.restoreArchivedNode(nodeId);
}
@Override
public void delete(String nodeId, Parameters parameters)
{
deletedNodes.purgeArchivedNode(nodeId);
}
}