From 2ffe3f7073ce8535ddc5728653618b798dcb3eb1 Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Tue, 20 Jul 2010 19:38:56 -0700
Subject: [PATCH] Update Routable part to use settings for Display/Editor
 locations

--HG--
branch : dev
---
 .../Routable/DataMigrations/RoutableDataMigration.cs | 12 +++++++++++-
 .../Core/Routable/Drivers/RoutableDriver.cs          |  4 +++-
 src/Orchard.Web/Core/Routable/Module.txt             |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Core/Routable/DataMigrations/RoutableDataMigration.cs b/src/Orchard.Web/Core/Routable/DataMigrations/RoutableDataMigration.cs
index a28b767ca..256951bac 100644
--- a/src/Orchard.Web/Core/Routable/DataMigrations/RoutableDataMigration.cs
+++ b/src/Orchard.Web/Core/Routable/DataMigrations/RoutableDataMigration.cs
@@ -1,4 +1,7 @@
-using Orchard.Data.Migration;
+using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.Core.Routable.Models;
+using Orchard.Data.Migration;
 
 namespace Orchard.Core.Routable.DataMigrations {
     public class RoutableDataMigration : DataMigrationImpl {
@@ -14,5 +17,12 @@ namespace Orchard.Core.Routable.DataMigrations {
 
             return 1;
         }
+
+        public int UpdateFrom1() {
+            ContentDefinitionManager.AlterPartDefinition(typeof(IsRoutable).Name, cfg => cfg
+                .WithLocation("EditorLocation", "primary", "before.5"));
+
+            return 2;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs
index 50db3646b..203a5324f 100644
--- a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs
+++ b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs
@@ -1,6 +1,7 @@
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
 using Orchard.ContentManagement.Drivers;
+using Orchard.Core.Common.Settings;
 using Orchard.Core.Routable.Models;
 using Orchard.Core.Routable.Services;
 using Orchard.Core.Routable.ViewModels;
@@ -66,7 +67,8 @@ namespace Orchard.Core.Routable.Drivers {
                     : "";
             }
 
-            return ContentPartTemplate(model, TemplateName, Prefix).Location("primary", "before.5");
+            var locationSettings = part.PartDefinition.Settings.GetModel<LocationSettings>("EditorLocation");
+            return ContentPartTemplate(model, TemplateName, Prefix).Location(locationSettings.Zone, locationSettings.Position);
         }
 
         protected override DriverResult Editor(IsRoutable part, IUpdateModel updater) {
diff --git a/src/Orchard.Web/Core/Routable/Module.txt b/src/Orchard.Web/Core/Routable/Module.txt
index 88c7acc6a..7ee9065be 100644
--- a/src/Orchard.Web/Core/Routable/Module.txt
+++ b/src/Orchard.Web/Core/Routable/Module.txt
@@ -8,4 +8,5 @@ description: The routable module enables content items to be accessed through a
 features:
     Routable:
         Description: Routable content part.
+        Dependencies: Settings
         Category: Core