From ebf3e23ab8dbacb4fc4b1fccb41227ed3136165a Mon Sep 17 00:00:00 2001 From: Mike Hatfield Date: Thu, 30 Apr 2009 14:47:55 +0000 Subject: [PATCH] ALFCOM-2805 - Version number differs between document library list and preview git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14141 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../webscripts/org/alfresco/office/documentDetails.get.html.ftl | 2 +- .../webscripts/org/alfresco/office/documentDetails.get.xml.ftl | 2 +- .../org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl | 2 +- .../webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl index 31e741d9fc..9afe1d846d 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl @@ -152,7 +152,7 @@ <#if d.isDocument > <#if d.hasAspect("cm:versionable")> <#assign versionRow=0> - <#list d.versionHistory?sort_by("versionLabel")?reverse as record> + <#list d.versionHistory as record> <#assign versionRow=versionRow+1> diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.xml.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.xml.ftl index cb4896ee3c..90517cc0ef 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.xml.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.xml.ftl @@ -78,7 +78,7 @@ <#if d.isDocument > <#if d.hasAspect("cm:versionable")> <#assign versionRow=0> - <#list d.versionHistory?sort_by("versionLabel")?reverse as record> + <#list d.versionHistory as record> <#assign versionRow=versionRow+1> ${record.versionLabel} diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl index 1b13c87ad4..e460692965 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl @@ -25,7 +25,7 @@ <#list doclist.items as item> <#assign d = item.asset> <#assign version = "1.0"> - <#if d.hasAspect("cm:versionable") && d.versionHistory?size != 0><#assign version = d.versionHistory?sort_by("versionLabel")?reverse[0].versionLabel> + <#if d.hasAspect("cm:versionable") && d.versionHistory?size != 0><#assign version = d.versionHistory[0].versionLabel> <#if item.owner??> <#assign lockedBy = (item.owner.properties.firstName + " " + item.owner.properties.lastName)?trim> <#assign lockedByUser = item.owner.properties.userName> diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl index 040e6d3211..5e16ccb76a 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl @@ -21,7 +21,7 @@ ], <#if page.hasAspect("cm:versionable")> "versionhistory": [ - <#list page.versionHistory?sort_by("versionLabel")?reverse as record> + <#list page.versionHistory as record> { "name": "${record.name}", "version": "${record.versionLabel}",