From 81cdd7718994c9d9a06be657c352d77787e94a34 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 11 Feb 2014 19:50:54 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    57125:
 Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)       56907: Merged
 V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)          56679: Merged DEV to
 V4.1-BUG-FIX (4.1.7)             54636, 56602 : MNT-9526 : REST API call like
 .http://localhost:8080/alfresco/service/api/classes/cm_content/property/cm_name.
 never returns constraint.                - Changing
 propertydefinition.lib.ftl for appropriate output

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../prefixed/propertydefinition.lib.ftl       | 20 +++++++++++--------
 .../dictionary/propertydefinition.lib.ftl     | 20 +++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/propertydefinition.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/propertydefinition.lib.ftl
index bc316281cf..0fd492da41 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/propertydefinition.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/propertydefinition.lib.ftl
@@ -25,20 +25,24 @@
 		"indexed" : ${propertydefs.indexed?string},
 		"indexedAtomically" : ${propertydefs.indexedAtomically?string},
 		"constraints" :
-		[<#--
-		<#if propertydefs.constraints?exists>
+		[
 			<#list propertydefs.constraints as constraintdefs>
 		{ 
-				<#assign keys = constraintdefs.getConstraint()?keys>
+			"type" : "${constraintdefs.getConstraint().getType()}",
+			"parameters" : 
+			[
+				<#assign params = constraintdefs.getConstraint().getParameters()>
+				<#assign keys = params?keys>
 				<#list keys as key>
-					<#if key == "expression">
-			"${key}" : <#if constraintdefs.getConstraint()[key]?exists>"${constraintdefs.getConstraint()[key]}" <#else>"has no value"</#if>
-					</#if>
-					<#if key_has_next>,</#if>   
+				{
+					"${key}" : <#rt><#if params[key]?is_enumerable>[<#list params[key] as mlist>"${mlist}"<#if mlist_has_next>,</#if></#list>]
+								<#t><#else><#if params[key]?is_boolean>${params[key]?string}<#else>"${params[key]?string}"</#if></#if>
+				}
+					<#if key_has_next>,</#if>
 				</#list> 
+			]
 		}<#if constraintdefs_has_next>,</#if>
 			</#list>
-		</#if>-->
 		],
 		"url" : "${"/api/property/" + propertydefs.name.toPrefixString()?replace(":","/")}"
 	}
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/propertydefinition.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/propertydefinition.lib.ftl
index 066a342d55..1052a2aa37 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/propertydefinition.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/propertydefinition.lib.ftl
@@ -25,20 +25,24 @@
 		"indexed" : ${propertydefs.indexed?string},
 		"indexedAtomically" : ${propertydefs.indexedAtomically?string},
 		"constraints" :
-		[<#--
-		<#if propertydefs.constraints?exists>
+		[
 			<#list propertydefs.constraints as constraintdefs>
 		{ 
-				<#assign keys = constraintdefs.getConstraint()?keys>
+			"type" : "${constraintdefs.getConstraint().getType()}",
+			"parameters" : 
+			[
+				<#assign params = constraintdefs.getConstraint().getParameters()>
+				<#assign keys = params?keys>
 				<#list keys as key>
-					<#if key == "expression">
-			"${key}" : <#if constraintdefs.getConstraint()[key]?exists>"${constraintdefs.getConstraint()[key]}" <#else>"has no value"</#if>
-					</#if>
-					<#if key_has_next>,</#if>   
+				{
+					"${key}" : <#rt><#if params[key]?is_enumerable>[<#list params[key] as mlist>"${mlist}"<#if mlist_has_next>,</#if></#list>]
+								<#t><#else><#if params[key]?is_boolean>${params[key]?string}<#else>"${params[key]?string}"</#if></#if>
+				}
+					<#if key_has_next>,</#if>
 				</#list> 
+			]
 		}<#if constraintdefs_has_next>,</#if>
 			</#list>
-		</#if>-->
 		],
 		"url" : "${"/api/property/" + propertydefs.name.toPrefixString()?replace(":","_")}"
 	}