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 
126486 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122626 jvonka: Nodes (FileFolder) API - add "permanent" option to delete node (to optionally bypass archive/trashcan)
      - follow-on such that user cannot delete permanently (even with delete permission) unless they're owner or admin of node (for hierarchy, only checks parent folder node) 
      RA-837, RA-642


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:42:25 +00:00
parent a489a4708e
commit 22f901e0dd
3 changed files with 97 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
View File

@@ -247,7 +247,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
}
}
// root (eg. Company Home for on-prem)
// -root- (eg. Company Home for on-prem)
protected String getRootNodeId(String runAsUserId) throws Exception
{
HttpResponse response = getSingle(NodesEntityResource.class, runAsUserId, Nodes.PATH_ROOT, null, 200);
@@ -255,7 +255,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
return node.getId();
}
// my (eg. User's Home for on-prem)
// -my- (eg. User's Home for on-prem)
protected String getMyNodeId(String runAsUserId) throws Exception
{
HttpResponse response = getSingle(NodesEntityResource.class, runAsUserId, Nodes.PATH_MY, null, 200);
@@ -263,6 +263,14 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
return node.getId();
}
// -shared- (eg. "Shared" folder for on-prem)
protected String getSharedNodeId(String runAsUserId) throws Exception
{
HttpResponse response = getSingle(NodesEntityResource.class, runAsUserId, Nodes.PATH_SHARED, null, 200);
Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
return node.getId();
}
protected Folder createFolder(String runAsUserId, String parentId, String folderName) throws Exception
{
return createFolder(runAsUserId, parentId, folderName, null);