lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 11:44:58 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Removing AutomaticContentPartDriver and ContentPartDriver.ContentPartTemplate. Fixes last of build warnings.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Dave Reed
2010-10-19 16:03:17 -07:00
parent 183b99895b
commit 35d3835979
4 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Tests/ContentManagement/Handlers/Coordinators/ContentPartDriverCoordinatorTests.cs
View File

@@ -93,14 +93,14 @@ namespace Orchard.Tests.ContentManagement.Handlers.Coordinators {
protected override DriverResult Editor(StubPart part, dynamic shapeHelper) {
var viewModel = new StubViewModel { Foo = string.Join(",", part.Foo) };
return ContentPartTemplate(viewModel).Location("last", "10");
return new ContentTemplateResult(viewModel, null, Prefix).Location("last", "10");
}
protected override DriverResult Editor(StubPart part, IUpdateModel updater, dynamic shapeHelper) {
var viewModel = new StubViewModel { Foo = string.Join(",", part.Foo) };
updater.TryUpdateModel(viewModel, Prefix, null, null);
part.Foo = viewModel.Foo.Split(new[] { ',' }).Select(x => x.Trim()).ToArray();
return ContentPartTemplate(viewModel).Location("last", "10");
return new ContentTemplateResult(viewModel, null, Prefix).Location("last", "10");
}
}

22
src/Orchard/ContentManagement/Drivers/AutomaticContentPartDriver.cs
View File

@@ -1,22 +0,0 @@
namespace Orchard.ContentManagement.Drivers {
public abstract class AutomaticContentPartDriver<TPart> : ContentPartDriver<TPart> where TPart : ContentPart, new() {
protected override string Prefix {
get {
return (typeof (TPart).Name);
}
}
protected override DriverResult Display(TPart part, string displayType, dynamic shapeHelper) {
return ContentPartTemplate(part);
}
protected override DriverResult Editor(TPart part, dynamic shapeHelper) {
return ContentPartTemplate(part);
}
protected override DriverResult Editor(TPart part, IUpdateModel updater, dynamic shapeHelper) {
updater.TryUpdateModel(part, Prefix, null, null);
return ContentPartTemplate(part);
}
}
}

13
src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
View File

@@ -58,19 +58,6 @@ namespace Orchard.ContentManagement.Drivers {
return shapeFactory.Create(shapeType);
}
[Obsolete]
public ContentTemplateResult ContentPartTemplate(object model) {
return new ContentTemplateResult(model, null, Prefix).Location(Zone);
}
[Obsolete]
public ContentTemplateResult ContentPartTemplate(object model, string template) {
return new ContentTemplateResult(model, template, Prefix).Location(Zone);
}
[Obsolete]
public ContentTemplateResult ContentPartTemplate(object model, string template, string prefix) {
return new ContentTemplateResult(model, template, prefix).Location(Zone);
}
public CombinedResult Combined(params DriverResult[] results) {
return new CombinedResult(results);
}

3
src/Orchard/Orchard.Framework.csproj
View File

@@ -235,9 +235,6 @@
<Compile Include="ContentManagement\DefaultContentQuery.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ContentManagement\Drivers\AutomaticContentPartDriver.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ContentManagement\Drivers\CombinedResult.cs">
<SubType>Code</SubType>
</Compile>