inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78611: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud): Bringing Maven installer up-to-date with Ant installer, and removing the latter
      74010: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         74007: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10)
            73973: MNT-11647: Impossible to check in the google spreadsheet
            Custom share configuration sample has been modified to reflect changes in the Google API
      74968: Merged DEV to V4.2-BUG-FIX (4.2.3)
         74960: MNT-11762 : include the new option <stripUserNameSuffix/> in the sample share-config-custom.xml
            - Added variable "stripUsernameSuffix" to share-config-custom file
      75142:  Merged DEV to V4.2-BUG-FIX (4.2.3)
         74496: MNT-11611: Delivered bin/apply_amps.sh doesn't use installer delivered java
           - java verification was added.
      76950: MNT-11947: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         76944: MNT-11945: Merged V4.1.2 (4.1.2.18) to V4.1-BUG-FIX (4.1.10)
            76360: MNT-11836: Persistent Cookies vulnerability
               - The new CookieInterceptor was added that removes the alfUsername2 cookie from response. This is configurable option and as default cookie won't be removed. Sample could be found in share-config-custom.xml.sample.
      77375: MNT-11159 Applied Bitrock fix to avoid invalid warning when installation folder field is empty
      77726: Merged DEV to V4.2-BUG-FIX (4.2.4)
         77705: MNT-11920 : Should remove jtds-1.2.5.jar in alfresco lib directory
         Removed jtds-1.2.5.jar from libs.
      77869: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         77451: Merged V4.1-BUG-FIX (4.1.10) to V4.2.3 (4.2.3)
            76492: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10)
               76264: MNT-11872 (Bitrock Case 15778) Tuning dependencies between Tomcat and Postgres Windows services, so that Postgres can stop.
               76396: MNT-11872 Apply newer Bitrock fix to finally stop services on Windows
               76466: MNT-11872 Apply newest Bitrock fix to finally finally stop services on Windows


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:45:54 +00:00
parent 21178f28f4
commit af3480e728
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
View File

@@ -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;
}