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 
126619 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125356 gjames: RA-917 Success code for restore operation should be 200


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

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

@@ -40,6 +40,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
@@ -72,7 +73,7 @@ public class TrashcanEntityResource implements
}
@Operation("restore")
@WebApiDescription(title = "Restore deleted Node", description="Restores an archived node")
@WebApiDescription(title = "Restore deleted Node", description="Restores an archived node",successStatus = HttpServletResponse.SC_OK)
public Node restoreDeletedNode(String nodeId, Void ignored, Parameters parameters, WithResponse withResponse)
{
return deletedNodes.restoreArchivedNode(nodeId);

4
source/test-java/org/alfresco/rest/DeletedNodesTest.java
View File

@@ -174,7 +174,7 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
delete(URL_NODES, u1.getId(), documentSameName.getId(), 204);
//Now we can restore it.
post(URL_DELETED_NODES+"/"+document.getId()+"/restore", u1.getId(), null, null, 201);
post(URL_DELETED_NODES+"/"+document.getId()+"/restore", u1.getId(), null, null, 200);
delete(URL_NODES, u1.getId(), createdFolder.getId(), 204);
@@ -186,7 +186,7 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
//User 2 can't restore it but user 1 can.
post(URL_DELETED_NODES+"/"+createdFolder.getId()+"/restore", u2.getId(), null, null, Status.STATUS_FORBIDDEN);
post(URL_DELETED_NODES+"/"+createdFolder.getId()+"/restore", u1.getId(), null, null, 201);
post(URL_DELETED_NODES+"/"+createdFolder.getId()+"/restore", u1.getId(), null, null, 200);
}
/**