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 
129804 amorarasu: REPO-340 / REPO-1136 - V1 REST API: Unlock Node
      - Removed the allowCheckedOut option from the unlock body


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

7
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -2991,12 +2991,7 @@ public class NodesImpl implements Nodes
{
unlockInfo.setIncludeChildren(false);
}
if (unlockInfo.getAllowCheckedOut() == null)
{
unlockInfo.setAllowCheckedOut(false);
}
lockService.unlock(nodeRef, unlockInfo.getIncludeChildren(), unlockInfo.getAllowCheckedOut());
lockService.unlock(nodeRef, unlockInfo.getIncludeChildren());
return getFolderOrDocument(nodeId, parameters);
}

22
source/java/org/alfresco/rest/api/model/UnlockInfo.java
View File

@@ -34,7 +34,7 @@ package org.alfresco.rest.api.model;
public class UnlockInfo
{
private Boolean includeChildren;
private Boolean allowCheckedOut;
// private Boolean allowCheckedOut;
public UnlockInfo() {}
@@ -47,14 +47,14 @@ public class UnlockInfo
{
this.includeChildren = includeChildren;
}
public Boolean getAllowCheckedOut()
{
return allowCheckedOut;
}
public void setAllowCheckedOut(Boolean allowCheckedOut)
{
this.allowCheckedOut = allowCheckedOut;
}
//
// public Boolean getAllowCheckedOut()
// {
// return allowCheckedOut;
// }
//
// public void setAllowCheckedOut(Boolean allowCheckedOut)
// {
// this.allowCheckedOut = allowCheckedOut;
// }
}

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

@@ -87,7 +87,6 @@ import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.util.GUID;
import org.alfresco.util.TempFileProvider;
import org.apache.http.HttpStatus;
import org.json.simple.JSONObject;
import org.junit.After;
import org.junit.Before;
@@ -3786,7 +3785,6 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
UnlockInfo unlockInfo = new UnlockInfo();
unlockInfo.setIncludeChildren(true);
unlockInfo.setAllowCheckedOut(true);
HttpResponse response = post(getNodeOperationUrl(d1Id, "unlock"), toJsonAsStringNonNull(unlockInfo), null, 200);
Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
@@ -3910,7 +3908,6 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
// Unlock folder and children
UnlockInfo unlockInfo = new UnlockInfo();
unlockInfo.setIncludeChildren(true);
unlockInfo.setAllowCheckedOut(true);
post(getNodeOperationUrl(folderAId, "unlock"), toJsonAsStringNonNull(unlockInfo), null, 200);
params = Collections.singletonMap("include", "aspectNames,properties,isLocked");