From 6d310fe3f1c920fe10956106d03a0c85ac6b6bbd Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Mon, 28 Jun 2010 13:22:34 -0700
Subject: [PATCH] Small update to not weld a content type's (implicit) part on
 twice

Also updated the Orchard.ContentTypes proj to not spin up cassini

--HG--
branch : dev
---
 .../Orchard.ContentTypes/Orchard.ContentTypes.csproj   |  6 ++----
 .../ContentManagement/Drivers/ContentFieldDriver.cs    |  3 +--
 .../ContentManagement/Handlers/ContentItemBuilder.cs   | 10 +++++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
index 248a7c49d..77e7c5269 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
@@ -109,7 +109,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="Helpers\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -137,9 +136,8 @@
           <IISUrl>
           </IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <UseCustomServer>True</UseCustomServer>
+          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
index 7338874c1..64139d934 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Orchard.ContentManagement.Handlers;
 using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Models;
 
 namespace Orchard.ContentManagement.Drivers {
     public abstract class ContentFieldDriver<TField> : IContentFieldDriver where TField : ContentField, new() {
@@ -15,7 +14,7 @@ namespace Orchard.ContentManagement.Drivers {
         }
 
         DriverResult IContentFieldDriver.BuildEditorModel(BuildEditorModelContext context) {
-            return Process(context.ContentItem, (part, field) => Editor(part, field));
+            return Process(context.ContentItem, Editor);
         }
 
         DriverResult IContentFieldDriver.UpdateEditorModel(UpdateEditorModelContext context) {
diff --git a/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs b/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs
index 1d0a2d428..f7af0e21b 100644
--- a/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs
+++ b/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs
@@ -26,12 +26,12 @@ namespace Orchard.ContentManagement.Handlers {
                 typePartDefinition = new ContentTypeDefinition.Part(
                     new ContentPartDefinition(partName),
                     new SettingsDictionary());
-            }
 
-            var part = new TPart {
-                TypePartDefinition = typePartDefinition
-            };
-            _item.Weld(part);
+                var part = new TPart {
+                    TypePartDefinition = typePartDefinition
+                };
+                _item.Weld(part);
+            }
             return this;
         }