From 65861160045042fc2eefa0ac9e5b12c19cda0f78 Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Wed, 21 Jul 2010 21:36:38 -0700
Subject: [PATCH] Store default location for the "HasTags" part in initial
 settings

--HG--
branch : dev
---
 .../DataMigrations/TagsDataMigration.cs           | 15 ++++++++++++++-
 .../Modules/Orchard.Tags/Drivers/HasTagsDriver.cs |  9 +++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs
index 8deb3e699..3953049c9 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs
@@ -1,4 +1,9 @@
-using Orchard.Data.Migration;
+using System.Collections.Generic;
+using Orchard.ContentManagement.Drivers;
+using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.Data.Migration;
+using Orchard.Tags.Models;
 
 namespace Orchard.Tags.DataMigrations {
     public class TagsDataMigration : DataMigrationImpl {
@@ -19,5 +24,13 @@ namespace Orchard.Tags.DataMigrations {
 
             return 1;
         }
+        public int UpdateFrom1() {
+            ContentDefinitionManager.AlterPartDefinition(typeof(HasTags).Name, cfg => cfg
+                .WithLocation(new Dictionary<string, ContentLocation> {
+                    {"Default", new ContentLocation { Zone = "primary", Position = "49" }},
+                    {"Editor", new ContentLocation { Zone = "primary", Position = "9" }},
+                }));
+            return 2;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Drivers/HasTagsDriver.cs b/src/Orchard.Web/Modules/Orchard.Tags/Drivers/HasTagsDriver.cs
index eea7a3471..1096bb9e9 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Drivers/HasTagsDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Drivers/HasTagsDriver.cs
@@ -24,8 +24,7 @@ namespace Orchard.Tags.Drivers {
         public virtual IUser CurrentUser { get; set; }
 
         protected override DriverResult Display(HasTags part, string displayType) {
-            var location = part.GetLocation(displayType, "primary", "49");
-            return ContentPartTemplate(part, "Parts/Tags.ShowTags").Location(location);
+            return ContentPartTemplate(part, "Parts/Tags.ShowTags").Location(part.GetLocation(displayType));
         }
 
         protected override DriverResult Editor(HasTags part) {
@@ -35,8 +34,7 @@ namespace Orchard.Tags.Drivers {
             var model = new EditTagsViewModel {
                                                   Tags = string.Join(", ", part.CurrentTags.Select((t, i) => t.TagName).ToArray())
                                               };
-            var location = part.GetLocation("Editor", "primary", "9");
-            return ContentPartTemplate(model, "Parts/Tags.EditTags").Location(location);
+            return ContentPartTemplate(model, "Parts/Tags.EditTags").Location(part.GetLocation("Editor"));
         }
 
         protected override DriverResult Editor(HasTags part, IUpdateModel updater) {
@@ -51,8 +49,7 @@ namespace Orchard.Tags.Drivers {
                 _tagService.UpdateTagsForContentItem(part.ContentItem.Id, tagNames);
             }
 
-            var location = part.GetLocation("Editor", "primary", "9");
-            return ContentPartTemplate(model, "Parts/Tags.EditTags").Location(location);
+            return ContentPartTemplate(model, "Parts/Tags.EditTags").Location(part.GetLocation("Editor"));
         }
     }
 }
\ No newline at end of file