lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Small update to not weld a content type's (implicit) part on twice

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

--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-06-28 13:22:34 -07:00
parent 0a38ebc8c4
commit 6d310fe3f1
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
View File

@@ -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>

3
src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
View File

@@ -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) {

10
src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs
View File

@@ -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;
}