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

Fix for ALF-1501: regex constraint on text field should allow blank if mandatory not set

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2010-04-20 10:49:59 +00:00
parent 703aeeaeb9
commit 0a85d1f52f
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java
View File

@@ -1056,13 +1056,29 @@ public abstract class ContentModelFormProcessor<ItemType, PersistType> extends
else if ((value instanceof String) && ((String) value).length() == 0)
{
// make sure empty strings stay as empty strings,
// everything else
// should be represented as null
if (!propDef.getDataType().getName().equals(DataTypeDefinition.TEXT)
&& !propDef.getDataType().getName().equals(DataTypeDefinition.MLTEXT))
// everything else should be represented as null
if (!propDef.getDataType().getName().equals(DataTypeDefinition.TEXT) &&
!propDef.getDataType().getName().equals(DataTypeDefinition.MLTEXT))
{
value = null;
}
else
{
// if the text property has a regex constraint set the empty
// string to null otherwise the integrity checker will reject it
List<ConstraintDefinition> constraints = propDef.getConstraints();
if (constraints != null && constraints.size() > 0)
{
for (ConstraintDefinition constraintDef : constraints)
{
if ("REGEX".equals(constraintDef.getConstraint().getType()))
{
value = null;
break;
}
}
}
}
}
// add the property to the map