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.0 (5.2.0) to HEAD (5.2)

Browse Source 
133904 msuzuki: ACE-5622, merge fix from 5.2.N to address search rest api fix for location field


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-01-11 10:36:22 +00:00
parent e5147104ad
commit df4d0f1fdc
17 changed files with 542 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,8 +133,12 @@ public class NodeVersionsRelation extends AbstractNodeRelation implements
private void mapVersionInfo(Version v, Node aNode)
{
aNode.setNodeRef(new NodeRef("", "", v.getVersionLabel()));
mapVersionInfo(v, aNode, new NodeRef("", "", v.getVersionLabel()));
}
public void mapVersionInfo(Version v, Node aNode, NodeRef nodeRef)
{
aNode.setNodeRef(nodeRef);
aNode.setVersionComment(v.getDescription());
Map<String, Object> props = aNode.getProperties();
@@ -279,7 +283,7 @@ public class NodeVersionsRelation extends AbstractNodeRelation implements
}
}
private Version findVersion(String nodeId, String versionLabelId)
public Version findVersion(String nodeId, String versionLabelId)
{
NodeRef nodeRef = nodes.validateOrLookupNode(nodeId, null);
VersionHistory vh = versionService.getVersionHistory(nodeRef);