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 
76608: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
      << Commits from broken build on V4.2-BUG-FIX >>
      76591: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         76521: Merged DEV to V4.2-BUG-FIX
          76328 : MNT-11854 : Consumer allowed to create Discussion, Wiki, Blog and Link if she/he creates the first item
           Add the changes - for discussion, blog and link containers we will get site permission. 
      76592: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         76523: Merged DEV to V4.2-BUG-FIX
          58015 : MNT-5877 : Unable to move a working copy
           Add actions to move/copy/delete working copies.
      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@77665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-22 16:06:29 +00:00
parent fb29bcf312
commit 873e79f0d4
2 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/domain/PropertyValue.java
View File

@@ -740,16 +740,6 @@ public class PropertyValue implements Cloneable, Serializable
return valueType.getOrdinalNumber(); 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 @Override
public boolean equals(Object obj) public boolean equals(Object obj)
{ {

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

@@ -31,7 +31,6 @@ import java.util.Set;
import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint; import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint;
import org.alfresco.repo.dictionary.constraint.RegisteredConstraint; import org.alfresco.repo.dictionary.constraint.RegisteredConstraint;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.forms.Field; import org.alfresco.repo.forms.Field;
import org.alfresco.repo.forms.FieldGroup; import org.alfresco.repo.forms.FieldGroup;
import org.alfresco.repo.forms.PropertyFieldDefinition; import org.alfresco.repo.forms.PropertyFieldDefinition;
@@ -167,15 +166,7 @@ public class PropertyFieldProcessor extends QNameFieldProcessor<PropertyDefiniti
PropertyDefinition propDef = data.getPropertyDefinition(name); PropertyDefinition propDef = data.getPropertyDefinition(name);
if (propDef != null) if (propDef != null)
{ {
QName typeQName = propDef.getDataType().getName(); return propDef.getDefaultValue();
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; return null;
} }