From daefd9f62415454717ef1ebf86f6f3bc4193314c Mon Sep 17 00:00:00 2001 From: Erik Porter Date: Wed, 10 Feb 2010 16:46:56 -0800 Subject: [PATCH] Merge 2 --HG-- branch : dev --- .../Modules/Orchard.Setup/ViewModels/SetupViewModel.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs b/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs index 4ee49845a..88d1cb3e1 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs @@ -7,14 +7,15 @@ namespace Orchard.Setup.ViewModels { public SetupViewModel() { DatabaseOptions = true; } + [Required(ErrorMessage = "Site name is required."), StringLength(70, ErrorMessage = "Site name can be no longer than 70 characters.")] public string SiteName { get; set; } [Required(ErrorMessage = "User name is required."), StringLengthMin(3, ErrorMessage = "User name must be longer than 3 characters."), StringLength(25, ErrorMessage = "User name can be no longer than 25 characters.")] public string AdminUsername { get; set; } [Required(ErrorMessage = "Password is required."), StringLengthMin(6, ErrorMessage = "Password must be longer than 6 characters."), StringLength(50, ErrorMessage = "Password can be no longer than 50 characters.")] public string AdminPassword { get; set; } + public bool DatabaseOptions { get; set; } [SqlDatabaseConnectionString] public string DatabaseConnectionString { get; set; } - public bool DatabaseOptions { get; set; } } } \ No newline at end of file