From e9da763689dd4b5beb06746b73bcde675a4dca1e Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Tue, 22 Jul 2014 15:59:13 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    76593:
 Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)       76534:
 MNT-10226: Merged DEV to V4.2-BUG-FIX (4.2.4)          76512: MNT-10226: Web
 Script - Status 500 error on 'Edit Properties' page after adding
 'Restrictable' aspect through CMIS 1.1 API             - Convert default
 value in appliance with type of the property.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77660 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/repo/domain/PropertyValue.java  | 10 ++++++++++
 .../forms/processor/node/PropertyFieldProcessor.java  | 11 ++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/domain/PropertyValue.java b/source/java/org/alfresco/repo/domain/PropertyValue.java
index 3b7d4a8f27..6f51bf0044 100644
--- a/source/java/org/alfresco/repo/domain/PropertyValue.java
+++ b/source/java/org/alfresco/repo/domain/PropertyValue.java
@@ -740,6 +740,16 @@ public class PropertyValue implements Cloneable, Serializable
         return valueType.getOrdinalNumber();
     }
     
+    /**
+     * If property value of the type <code>QName</code> is supported
+     * 
+     * @param typeQName   the type qualified name
+     */
+    public static boolean isDataTypeSupported(QName typeQName)
+    {
+        return valueTypesByPropertyType.keySet().contains(typeQName);
+    }
+    
     @Override
     public boolean equals(Object obj)
     {
diff --git a/source/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java b/source/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
index 08ec7bc6f3..25a30d1a60 100644
--- a/source/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
+++ b/source/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
@@ -31,6 +31,7 @@ import java.util.Set;
 
 import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint;
 import org.alfresco.repo.dictionary.constraint.RegisteredConstraint;
+import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.repo.forms.Field;
 import org.alfresco.repo.forms.FieldGroup;
 import org.alfresco.repo.forms.PropertyFieldDefinition;
@@ -166,7 +167,15 @@ public class PropertyFieldProcessor extends QNameFieldProcessor<PropertyDefiniti
         PropertyDefinition propDef = data.getPropertyDefinition(name);
         if (propDef != null)
         {
-            return propDef.getDefaultValue();
+            QName typeQName = propDef.getDataType().getName();
+            String strDefaultValue = propDef.getDefaultValue();
+            if (PropertyValue.isDataTypeSupported(typeQName))
+            {
+                // convert to the appropriate type
+                PropertyValue pv = new PropertyValue(typeQName, strDefaultValue);
+                return pv.getValue(typeQName);
+            }
+            return strDefaultValue;
         }
         return null;
     }