lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-23 12:53:33 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Erik Porter
2010-02-10 16:44:50 -08:00
parent cd42f33fbf d3e35ff0a5
commit c101021e3d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
View File

@@ -50,11 +50,15 @@ namespace Orchard.Setup.Controllers {
[HttpPost, ActionName("Index")] [HttpPost, ActionName("Index")]
public ActionResult IndexPOST(SetupViewModel model) { public ActionResult IndexPOST(SetupViewModel model) {
try { //HACK: (erikpo) Couldn't get a custom ValidationAttribute to validate two properties
if (!ModelState.IsValid) { if (!model.DatabaseOptions && string.IsNullOrEmpty(model.DatabaseConnectionString))
return Index(model); ModelState.AddModelError("DatabaseConnectionString", "A SQL connection string is required");
}
if (!ModelState.IsValid) {
return Index(model);
}
try {
var shellSettings = new ShellSettings { var shellSettings = new ShellSettings {
Name = "default", Name = "default",
DataProvider = model.DatabaseOptions ? "SQLite" : "SqlServer", DataProvider = model.DatabaseOptions ? "SQLite" : "SqlServer",

3
src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
View File

@@ -4,6 +4,9 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Setup.ViewModels { namespace Orchard.Setup.ViewModels {
public class SetupViewModel : BaseViewModel { public class SetupViewModel : BaseViewModel {
public SetupViewModel() {
DatabaseOptions = true;
}
[Required(ErrorMessage = "Site name is required."), StringLength(70, ErrorMessage = "Site name can be no longer than 70 characters.")] [Required(ErrorMessage = "Site name is required."), StringLength(70, ErrorMessage = "Site name can be no longer than 70 characters.")]
public string SiteName { get; set; } 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.")] [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.")]