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 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
130046 jvonka: REPO-1187 / REPO-164: V1 REST API to "lock content node" - initially, we will support one of two lock types, either ALLOW_OWNER_CHANGES (default, if not requested otherwise) or FULL
   - we will not support ALLOW_ADD_CHILDREN lock type (removed as part of this change request)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 14:45:36 +00:00
parent dd8adcbd2f
commit 76e33da7f5
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/rest/api/model/LockInfo.java
View File

@@ -49,8 +49,8 @@ public class LockInfo
public static enum LockType2 public static enum LockType2
{ {
FULL(LockType.READ_ONLY_LOCK), FULL(LockType.READ_ONLY_LOCK),
ALLOW_ADD_CHILDREN(LockType.NODE_LOCK),
ALLOW_OWNER_CHANGES(LockType.WRITE_LOCK); ALLOW_OWNER_CHANGES(LockType.WRITE_LOCK);
// ALLOW_ADD_CHILDREN(LockType.NODE_LOCK); // removed for now, as per REPO-1187
private LockType type; private LockType type;
@@ -58,6 +58,7 @@ public class LockInfo
{ {
this.type = type; this.type = type;
} }
public LockType getType() public LockType getType()
{ {
return type; return type;

4
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -3729,6 +3729,10 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
body.put("type", "FULL123"); body.put("type", "FULL123");
post(getNodeOperationUrl(dC1Id, "lock"), toJsonAsStringNonNull(body), null, 400); post(getNodeOperationUrl(dC1Id, "lock"), toJsonAsStringNonNull(body), null, 400);
body = new HashMap<>();
body.put("type", "ALLOW_ADD_CHILDREN");
post(getNodeOperationUrl(dC1Id, "lock"), toJsonAsStringNonNull(body), null, 400);
body = new HashMap<>(); body = new HashMap<>();
body.put("lifetime", "PERSISTENT123"); body.put("lifetime", "PERSISTENT123");
post(getNodeOperationUrl(dC1Id, "lock"), toJsonAsStringNonNull(body), null, 400); post(getNodeOperationUrl(dC1Id, "lock"), toJsonAsStringNonNull(body), null, 400);