From 7ad69ecb417a1cbf9280dadfa959f4a35d8c09dc Mon Sep 17 00:00:00 2001
From: Dave Reed <dareed@microsoft.com>
Date: Mon, 14 Mar 2011 12:21:54 -0700
Subject: [PATCH] Removing Navigation Migration's knowledge of Orchard.Blogs.

--HG--
branch : dev
---
 src/Orchard.Web/Core/Navigation/Migrations.cs       | 3 ---
 src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs | 9 ++++++++-
 src/Orchard.Web/Modules/Orchard.Blogs/Module.txt    | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Core/Navigation/Migrations.cs b/src/Orchard.Web/Core/Navigation/Migrations.cs
index a2f7ce861..bf0644cc4 100644
--- a/src/Orchard.Web/Core/Navigation/Migrations.cs
+++ b/src/Orchard.Web/Core/Navigation/Migrations.cs
@@ -20,7 +20,6 @@ namespace Orchard.Core.Navigation {
                     .Column<bool>("OnMainMenu")
                 );
 
-            ContentDefinitionManager.AlterTypeDefinition("Blog", cfg => cfg.WithPart("MenuPart"));
             ContentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg.WithPart("MenuPart"));
             ContentDefinitionManager.AlterTypeDefinition("MenuItem", cfg => cfg.WithPart("MenuPart"));
             ContentDefinitionManager.AlterPartDefinition("MenuPart", builder => builder.Attachable());
@@ -37,8 +36,6 @@ namespace Orchard.Core.Navigation {
                     .Column<bool>("OnAdminMenu")
                 );
             ContentDefinitionManager.AlterPartDefinition("AdminMenuPart", builder => builder.Attachable());
-
-            ContentDefinitionManager.AlterTypeDefinition("Blog", cfg => cfg.WithPart("AdminMenuPart"));
             return 2;
         }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
index 1fc750a75..aee3eaeaf 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
@@ -39,6 +39,8 @@ namespace Orchard.Blogs {
                     .WithPart("BlogPart")
                     .WithPart("CommonPart")
                     .WithPart("RoutePart")
+                    .WithPart("MenuPart")
+                    .WithPart("AdminMenuPart")
                 );
 
             ContentDefinitionManager.AlterTypeDefinition("BlogPost",
@@ -66,7 +68,12 @@ namespace Orchard.Blogs {
                     .WithSetting("Stereotype", "Widget")
                 );
 
-            return 1;
+            return 2;
+        }
+
+        public int UpdateFrom1() {
+            ContentDefinitionManager.AlterTypeDefinition("Blog", cfg => cfg.WithPart("AdminMenuPart"));
+            return 2;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
index 80077ef2c..897297e90 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
@@ -9,7 +9,7 @@ Features:
     Orchard.Blogs:
         Name: Blogs
         Description: A simple web log.
-        Dependencies: Shapes, Common, Routable, Feeds, Orchard.Widgets, Orchard.jQuery, Orchard.PublishLater
+        Dependencies: Shapes, Common, Routable, Feeds, Navigation, Orchard.Widgets, Orchard.jQuery, Orchard.PublishLater
         Category: Content
     Orchard.Blogs.RemotePublishing:
         Name: Remote Blog Publishing