diff --git a/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs index 4db0afd359..c51f572817 100644 --- a/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs +++ b/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Umbraco.Core.Composing; using Umbraco.Core.Services; namespace Umbraco.Core.PropertyEditors.Validators @@ -11,7 +12,7 @@ namespace Umbraco.Core.PropertyEditors.Validators { private readonly ILocalizedTextService _textService; - public RequiredValidator() + public RequiredValidator() : this(Current.Services.TextService) { } diff --git a/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs index 7bb803ffa8..8e9f13b4ef 100644 --- a/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs +++ b/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs @@ -51,8 +51,8 @@ namespace Umbraco.Web.Editors.Filters //validate for each variant foreach (var variant in model.Variants) { - if (contentItemValidator.ValidateProperties(model, variant, actionContext) == false) return; - if (contentItemValidator.ValidatePropertyData(model, variant, variant.PropertyCollectionDto, actionContext.ModelState) == false) return; + if (contentItemValidator.ValidateProperties(model, variant, actionContext)) + contentItemValidator.ValidatePropertyData(model, variant, variant.PropertyCollectionDto, actionContext.ModelState); } } } diff --git a/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs index 4bb2e72b0c..36bab16ed1 100644 --- a/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs +++ b/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs @@ -44,9 +44,9 @@ namespace Umbraco.Web.Editors.Filters if (ValidateUserAccess(model, actionContext)) { //now do each validation step - if (!contentItemValidator.ValidateExistingContent(model, actionContext)) return; - if (!contentItemValidator.ValidateProperties(model, model, actionContext)) return; - if (!contentItemValidator.ValidatePropertyData(model, model, model.PropertyCollectionDto, actionContext.ModelState)) return; + if (contentItemValidator.ValidateExistingContent(model, actionContext)) + if (!contentItemValidator.ValidateProperties(model, model, actionContext)) + contentItemValidator.ValidatePropertyData(model, model, model.PropertyCollectionDto, actionContext.ModelState); } } diff --git a/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs index 7333a39536..619bd76333 100644 --- a/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs +++ b/src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs @@ -33,9 +33,9 @@ namespace Umbraco.Web.Editors.Filters var model = (MemberSave)actionContext.ActionArguments["contentItem"]; var contentItemValidator = new MemberValidationHelper(_logger, _umbracoContextAccessor); //now do each validation step - if (!contentItemValidator.ValidateExistingContent(model, actionContext)) return; - if (!contentItemValidator.ValidateProperties(model, model, actionContext)) return; - if (!contentItemValidator.ValidatePropertyData(model, model, model.PropertyCollectionDto, actionContext.ModelState)) return; + if (contentItemValidator.ValidateExistingContent(model, actionContext)) + if (contentItemValidator.ValidateProperties(model, model, actionContext)) + contentItemValidator.ValidatePropertyData(model, model, model.PropertyCollectionDto, actionContext.ModelState); } } }