From 002ac0a4a329a10a02c0b4217208618a870d4d12 Mon Sep 17 00:00:00 2001
From: Suha Can <suhacan@microsoft.com>
Date: Fri, 18 Feb 2011 18:29:46 -0800
Subject: [PATCH] Making selection of a recipe non-optional in Setup.

--HG--
branch : recipe
---
 .../Modules/Orchard.Setup/Controllers/SetupController.cs     | 5 +++--
 .../Modules/Orchard.Setup/Services/SetupService.cs           | 4 +---
 .../Modules/Orchard.Setup/ViewModels/SetupViewModel.cs       | 1 -
 .../Modules/Orchard.Setup/Views/Setup/Index.cshtml           | 4 +---
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
index 99b49ea15..d4d6bb965 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
@@ -57,7 +57,6 @@ namespace Orchard.Setup.Controllers {
             return IndexViewResult(new SetupViewModel {
                 AdminUsername = "admin",
                 DatabaseIsPreconfigured = !string.IsNullOrEmpty(initialSettings.DataProvider),
-                HasRecipes = recipes.Count > 0,
                 Recipes = recipes
             });
         }
@@ -78,10 +77,12 @@ namespace Orchard.Setup.Controllers {
                     ModelState.AddModelError("DatabaseTablePrefix", T("The table prefix must begin with a letter").Text);
                 }
             }
+            if (String.IsNullOrEmpty(model.Recipe)) {
+                ModelState.AddModelError("Recipe", T("You must choose a recipe. Recipes come from the Recipes folder of your Setup module.").Text);
+            }
 
             if (!ModelState.IsValid) {
                 var recipes = (List<Recipe>)_setupService.Recipes();
-                model.HasRecipes = recipes.Count > 0;
                 model.Recipes = recipes;
                 if (!String.IsNullOrEmpty(model.Recipe)) {
                     foreach (var recipe in recipes.Where(recipe => recipe.Name == model.Recipe)) {
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 20cc783f0..a605c7691 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -227,9 +227,7 @@ namespace Orchard.Setup.Services {
             cultureManager.AddCulture("en-US");
 
             var recipeManager = environment.Resolve<IRecipeManager>();
-            if (context.Recipe != null) {
-                executionId = recipeManager.Execute(Recipes().Where(r => r.Name == context.Recipe).FirstOrDefault());
-            }
+            executionId = recipeManager.Execute(Recipes().Where(r => r.Name == context.Recipe).FirstOrDefault());
 
             var contentManager = environment.Resolve<IContentManager>();
             // If "Orchard.Widgets" is enabled, setup default layers and widgets
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs b/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
index 931c2b3c1..dcc824f17 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
@@ -22,7 +22,6 @@ namespace Orchard.Setup.ViewModels {
         public string DatabaseTablePrefix { get; set; }
         public bool DatabaseIsPreconfigured { get; set; }
 
-        public bool HasRecipes { get; set; }
         public IEnumerable<Recipe> Recipes { get; set; }
         public string Recipe { get; set; }
         public string RecipeDescription { get; set; }
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
index 2795d17c5..c43d1693b 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
@@ -51,9 +51,8 @@ if (!Model.DatabaseIsPreconfigured) {
     </div>
 </fieldset>
 }
-if (Model.HasRecipes) {
 <fieldset>
-	<legend>@T("Use an Orchard Recipe during setup (Optional)")</legend>
+	<legend>@T("Choose an Orchard Recipe")</legend>
 	<div>@T("Orchard Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box")</div>	
 	<div>
         <select id="@Html.FieldIdFor(m => m.Recipe)" name="@Html.FieldNameFor(m => m.Recipe)" class="recipe">
@@ -66,7 +65,6 @@ if (Model.HasRecipes) {
     </div>
 	<div id="recipedescription">@Model.RecipeDescription</div>
 </fieldset>
-}
 <div id="throbber">
     <div class="curtain"></div>
     <div class="curtain-content">