From 07b8124b1b7ca36d2d67bb8102b73688f7d47551 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Fri, 3 Sep 2010 13:47:20 +0000
Subject: [PATCH] Added "version" property to GET workflow-definitions REST API

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repository/workflow/workflow.lib.ftl         | 4 ++--
 .../repo/web/scripts/workflow/WorkflowModelBuilder.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow.lib.ftl
index 3159793521..67bd817095 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow.lib.ftl
@@ -150,9 +150,9 @@
          "url": "${workflowDefinition.url}",
          "name": "${workflowDefinition.name}",
          "title": "${workflowDefinition.title}",
-         "description": "${workflowDefinition.description}"
+         "description": "${workflowDefinition.description}",
+         "version": "${workflowDefinition.version}"
          <#if detailed>,
-         "version": "${workflowDefinition.version}",
          "startTaskDefinitionUrl": "${workflowDefinition.startTaskDefinitionUrl}",
          "startTaskDefinitionType": "${shortQName(workflowDefinition.startTaskDefinitionType)}",
          "taskDefinitions": 
diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java
index e9635feb25..a53074c362 100644
--- a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java
+++ b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java
@@ -341,6 +341,7 @@ public class WorkflowModelBuilder
         model.put(WORKFLOW_DEFINITION_NAME, workflowDefinition.getName());
         model.put(WORKFLOW_DEFINITION_TITLE, workflowDefinition.getTitle());
         model.put(WORKFLOW_DEFINITION_DESCRIPTION, workflowDefinition.getDescription());
+        model.put(WORKFLOW_DEFINITION_VERSION, workflowDefinition.getVersion());
 
         return model;
     }
@@ -355,7 +356,6 @@ public class WorkflowModelBuilder
     {
         Map<String, Object> model = buildSimple(workflowDefinition);
 
-        model.put(WORKFLOW_DEFINITION_VERSION, workflowDefinition.getVersion());
         model.put(WORKFLOW_DEFINITION_START_TASK_DEFINITION_URL, getUrl(workflowDefinition.getStartTaskDefinition().getMetadata()));
         model.put(WORKFLOW_DEFINITION_START_TASK_DEFINITION_TYPE, workflowDefinition.getStartTaskDefinition().getMetadata().getName());