diff --git a/src/OrchardCore.Modules/OrchardCore.Setup/Annotations/SiteNameValidAttribute.cs b/src/OrchardCore.Modules/OrchardCore.Setup/Annotations/SiteNameValidAttribute.cs deleted file mode 100644 index d46fce4707d..00000000000 --- a/src/OrchardCore.Modules/OrchardCore.Setup/Annotations/SiteNameValidAttribute.cs +++ /dev/null @@ -1,26 +0,0 @@ -namespace OrchardCore.Setup.Annotations -{ - public class SiteNameValidAttribute : System.ComponentModel.DataAnnotations.RangeAttribute - { - private string _value; - - public SiteNameValidAttribute(int maximumLength) - : base(1, maximumLength) - { - } - - public override bool IsValid(object value) - { - _value = (value as string) ?? ""; - return base.IsValid(_value.Trim().Length); - } - - public override string FormatErrorMessage(string name) - { - if (string.IsNullOrWhiteSpace(_value)) - return "Site name is required."; - - return $"Site name can be no longer than {Maximum} characters."; - } - } -} diff --git a/src/OrchardCore.Modules/OrchardCore.Setup/ViewModels/SetupViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Setup/ViewModels/SetupViewModel.cs index a7a82d7c5d3..7cf87d9f8ef 100644 --- a/src/OrchardCore.Modules/OrchardCore.Setup/ViewModels/SetupViewModel.cs +++ b/src/OrchardCore.Modules/OrchardCore.Setup/ViewModels/SetupViewModel.cs @@ -4,14 +4,13 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using OrchardCore.Data; using OrchardCore.Recipes.Models; -using OrchardCore.Setup.Annotations; namespace OrchardCore.Setup.ViewModels { public class SetupViewModel { [Required] - [SiteNameValid(maximumLength: 70)] + [StringLength(70)] public string SiteName { get; set; } public string Description { get; set; }