yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes: U4-4669 Required checkbox is overruled by regex on document type

Browse Source
This commit is contained in:
Shannon
2015-07-23 14:44:02 +02:00
parent 7cd47114e0
commit 9606cab81e
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Web/WebApi/Filters/ContentItemValidationHelper.cs
View File

@@ -152,10 +152,26 @@ namespace Umbraco.Web.WebApi.Filters
if (p.ValidationRegExp.IsNullOrWhiteSpace() == false)
{
foreach (var result in p.PropertyEditor.ValueEditor.RegexValidator.Validate(postedValue, p.ValidationRegExp, preValues, editor))
//We only want to execute the regex statement if:
// * the value is null or empty AND it is required OR
// * the value is not null or empty
//See: http://issues.umbraco.org/issue/U4-4669
var asString = postedValue as string;
if (
//Value is not null or empty
(postedValue != null && asString.IsNullOrWhiteSpace() == false)
//It's required
|| (p.IsRequired))
{
actionContext.ModelState.AddPropertyError(result, p.Alias);
foreach (var result in p.PropertyEditor.ValueEditor.RegexValidator.Validate(postedValue, p.ValidationRegExp, preValues, editor))
{
actionContext.ModelState.AddPropertyError(result, p.Alias);
}
}
}
}