From dd9804ce127f17e5089bc911b17e39d55790cca8 Mon Sep 17 00:00:00 2001
From: Louis DeJardin <Louis.DeJardin@microsoft.com>
Date: Fri, 19 Feb 2010 11:51:21 -0800
Subject: [PATCH] Updating SetupController to work with new [Required]
 attribute behavior

GET method no longer takes model as an argument
see also http://bradwilson.typepad.com/blog/2010/01/input-validation-vs-model-validation-in-aspnet-mvc.html

--HG--
branch : dev
---
 .../Orchard.Setup/Controllers/SetupController.cs     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
index 0ab0d8111..c4eaa120b 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
@@ -35,7 +35,7 @@ namespace Orchard.Setup.Controllers {
 
         private Localizer T { get; set; }
 
-        public ActionResult Index(SetupViewModel model) {
+        private ActionResult IndexViewResult(SetupViewModel model) {
             string message = "";
             if (!CanWriteToAppDataFolder(out message)) {
                 _notifier.Error(
@@ -44,7 +44,11 @@ namespace Orchard.Setup.Controllers {
                         message));
             }
 
-            return View(model ?? new SetupViewModel { AdminUsername = "admin" });
+            return View(model);
+        }
+
+        public ActionResult Index() {
+            return IndexViewResult(new SetupViewModel { AdminUsername = "admin" });
         }
 
         [HttpPost, ActionName("Index")]
@@ -54,7 +58,7 @@ namespace Orchard.Setup.Controllers {
                 ModelState.AddModelError("DatabaseConnectionString", "A SQL connection string is required");
 
             if (!ModelState.IsValid) {
-                return Index(model);
+                return IndexViewResult(model);
             }
 
             try {
@@ -129,7 +133,7 @@ namespace Orchard.Setup.Controllers {
             }
             catch (Exception exception) {
                 _notifier.Error(T("Setup failed: " + exception.Message));
-                return Index(model);
+                return IndexViewResult(model);
             }
         }