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 RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)

Browse Source 
128232 jvonka: V1 REST API: Node Version History - add "delete version" operation
   - DELETE /nodes/nodeId/versions/versionId
   REPO-835


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129136 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
2016-08-05 10:13:51 +00:00
parent dbb8bd31e8
commit fa533a6b57
3 changed files with 261 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2254,7 +2254,7 @@ public class NodesImpl implements Nodes
}
String versionComment = parameters.getParameter(PARAM_VERSION_COMMENT);
final String fileName = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
final String fileName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
return updateExistingFile(null, nodeRef, fileName, contentInfo, stream, parameters, versionMajor, versionComment);
}
@@ -2276,7 +2276,15 @@ public class NodesImpl implements Nodes
}
else
{
versionType = (isVersioned ? versionType = VersionType.MINOR : VersionType.MAJOR);
// note: it is possible to have versionable aspect but no versions (=> no version label)
if ((! isVersioned) || (nodeService.getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL) == null))
{
versionType = VersionType.MAJOR;
}
else
{
versionType = VersionType.MINOR;
}
}
createVersion(nodeRef, isVersioned, versionType, versionComment);