Simplifying, removing dead code from blog drivers.

--HG--
branch : dev
This commit is contained in:
andrerod
2011-02-04 19:49:10 -08:00
parent 4d4c362d31
commit 9a0f00339e
3 changed files with 3 additions and 55 deletions

View File

@@ -1,37 +1,11 @@
using JetBrains.Annotations; using JetBrains.Annotations;
using Orchard.Blogs.Models; using Orchard.Blogs.Models;
using Orchard.Blogs.Services;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.ContentManagement.Drivers; using Orchard.ContentManagement.Drivers;
using Orchard.Core.Feeds;
using Orchard.Localization;
namespace Orchard.Blogs.Drivers { namespace Orchard.Blogs.Drivers {
[UsedImplicitly] [UsedImplicitly]
public class BlogPartDriver : ContentPartDriver<BlogPart> { public class BlogPartDriver : ContentPartDriver<BlogPart> {
public IOrchardServices Services { get; set; }
private readonly IContentManager _contentManager;
private readonly IBlogPostService _blogPostService;
private readonly IFeedManager _feedManager;
public BlogPartDriver(
IOrchardServices services,
IContentManager contentManager,
IBlogPostService blogPostService,
IFeedManager feedManager) {
Services = services;
_contentManager = contentManager;
_blogPostService = blogPostService;
_feedManager = feedManager;
T = NullLocalizer.Instance;
}
public Localizer T { get; set; }
protected override string Prefix { get { return ""; } }
protected override DriverResult Display(BlogPart part, string displayType, dynamic shapeHelper) { protected override DriverResult Display(BlogPart part, string displayType, dynamic shapeHelper) {
return Combined( return Combined(
ContentShape("Parts_Blogs_Blog_Manage", ContentShape("Parts_Blogs_Blog_Manage",
@@ -40,24 +14,6 @@ namespace Orchard.Blogs.Drivers {
() => shapeHelper.Parts_Blogs_Blog_Description(ContentPart: part, Description: part.Description)), () => shapeHelper.Parts_Blogs_Blog_Description(ContentPart: part, Description: part.Description)),
ContentShape("Parts_Blogs_Blog_BlogPostCount", ContentShape("Parts_Blogs_Blog_BlogPostCount",
() => shapeHelper.Parts_Blogs_Blog_BlogPostCount(ContentPart: part, PostCount: part.PostCount)) () => shapeHelper.Parts_Blogs_Blog_BlogPostCount(ContentPart: part, PostCount: part.PostCount))
//,
// todo: (heskew) implement a paging solution that doesn't require blog posts to be tied to the blog within the controller
//ContentShape("Parts_Blogs_BlogPost_List",
// () => {
// _feedManager.Register(part);
// var list = shapeHelper.List();
// list.AddRange(_blogPostService.Get(part)
// .Select(bp => _contentManager.BuildDisplay(bp, "Summary")));
// return shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, ContentItems: list);
// }),
//ContentShape("Parts_Blogs_BlogPost_List_Admin",
// () =>
// {
// var list = shapeHelper.List();
// list.AddRange(_blogPostService.Get(part, VersionOptions.Latest)
// .Select(bp => _contentManager.BuildDisplay(bp, "SummaryAdmin")));
// return shapeHelper.Parts_Blogs_BlogPost_List_Admin(ContentPart: part, ContentItems: list);
// })
); );
} }

View File

@@ -3,24 +3,16 @@ using Orchard.Blogs.Models;
using Orchard.Blogs.Extensions; using Orchard.Blogs.Extensions;
using Orchard.ContentManagement.Drivers; using Orchard.ContentManagement.Drivers;
using Orchard.Core.Feeds; using Orchard.Core.Feeds;
using Orchard.Localization;
namespace Orchard.Blogs.Drivers { namespace Orchard.Blogs.Drivers {
[UsedImplicitly] [UsedImplicitly]
public class BlogPostPartDriver : ContentPartDriver<BlogPostPart> { public class BlogPostPartDriver : ContentPartDriver<BlogPostPart> {
private readonly IFeedManager _feedManager; private readonly IFeedManager _feedManager;
public IOrchardServices Services { get; set; }
public BlogPostPartDriver(IOrchardServices services, IFeedManager feedManager) { public BlogPostPartDriver(IFeedManager feedManager) {
_feedManager = feedManager; _feedManager = feedManager;
Services = services;
T = NullLocalizer.Instance;
} }
public Localizer T { get; set; }
protected override string Prefix { get { return ""; } }
protected override DriverResult Display(BlogPostPart part, string displayType, dynamic shapeHelper) { protected override DriverResult Display(BlogPostPart part, string displayType, dynamic shapeHelper) {
if (displayType.StartsWith("Detail")) if (displayType.StartsWith("Detail"))
_feedManager.Register(part.BlogPart); _feedManager.Register(part.BlogPart);

View File

@@ -60,8 +60,8 @@ namespace Orchard.Blogs.Drivers {
if (updater.TryUpdateModel(viewModel, Prefix, null, null)) { if (updater.TryUpdateModel(viewModel, Prefix, null, null)) {
part.ForBlog = viewModel.Path; part.ForBlog = viewModel.Path;
part.Count = viewModel.Count; part.Count = viewModel.Count;
} }
return Editor(part, shapeHelper); return Editor(part, shapeHelper);
} }
} }