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 
129826 jvonka: REPO-164 / REPO-1150: fix minor regress (eg. if recursively locking nodes via includeChildren)
   -  MNT-16446, MNT-14945


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

17
source/test-java/org/alfresco/rest/api/tests/RepoService.java
View File

@@ -365,14 +365,27 @@ public class RepoService
nodeService.deleteNode(nodeRef);
}
//
// TODO replace with V1 REST API to Lock/Unlock - except calls to includeChildren (which may not be exposed, initially
//
public void lockNode(NodeRef nodeRef)
{
lockService.lock(nodeRef, LockType.NODE_LOCK);
lockNode(nodeRef, LockType.NODE_LOCK, 0, false);
}
public void lockNode(NodeRef nodeRef, LockType lockType, int timeToExpire, boolean includeChildren)
{
lockService.lock(nodeRef, lockType, timeToExpire, includeChildren);
}
public void unlockNode(NodeRef nodeRef)
{
lockService.unlock(nodeRef);
unlockNode(nodeRef, false);
}
public void unlockNode(NodeRef nodeRef, boolean includeChildren)
{
lockService.unlock(nodeRef, true, false);
}
public NodeRef addUserDescription(final String personId, final TestNetwork network, final String personDescription)