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 
129130 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128162 jvonka: V1 REST API: Node Version History - initial api tests
      - REPO-313: list version history
      - REPO-327: get version info
      - REPO-229: download version content


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:10:00 +00:00
parent 5d42543f51
commit 66c7905ee2
4 changed files with 634 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java
View File

@@ -25,6 +25,7 @@
*/
package org.alfresco.rest.api.nodes;
import org.alfresco.repo.version.Version2Model;
import org.alfresco.rest.api.Nodes;
import org.alfresco.rest.api.model.Node;
import org.alfresco.rest.api.model.UserInfo;
@@ -125,6 +126,13 @@ public class NodeVersionsRelation implements
aNode.setVersionComment(v.getDescription());
Map<String, Object> props = aNode.getProperties();
if (props != null)
{
// special case (as per Version2Service)
props.put("cm:"+Version2Model.PROP_VERSION_TYPE, v.getVersionProperty(Version2Model.PROP_VERSION_TYPE));
}
//Don't show parentId, createdAt, createdByUser
aNode.setParentId(null);
aNode.setCreated(null);
@@ -139,8 +147,7 @@ public class NodeVersionsRelation implements
if (v != null)
{
List<String> includeParam = parameters.getInclude();
Node node = nodes.getFolderOrDocument(v.getFrozenStateNodeRef(), null, null, includeParam, null);
Node node = nodes.getFolderOrDocumentFullInfo(v.getFrozenStateNodeRef(), null, null, parameters, null);
mapVersionInfo(v, node);
return node;
}