From 9a0f00339ef2cb2e8310252882c5361cb058369b Mon Sep 17 00:00:00 2001 From: andrerod Date: Fri, 4 Feb 2011 19:49:10 -0800 Subject: [PATCH] Simplifying, removing dead code from blog drivers. --HG-- branch : dev --- .../Orchard.Blogs/Drivers/BlogPartDriver.cs | 44 ------------------- .../Drivers/BlogPostPartDriver.cs | 10 +---- .../Drivers/RecentBlogPostsPartDriver.cs | 4 +- 3 files changed, 3 insertions(+), 55 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs index e4156745e..dfff9e6b3 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs @@ -1,37 +1,11 @@ using JetBrains.Annotations; using Orchard.Blogs.Models; -using Orchard.Blogs.Services; using Orchard.ContentManagement; using Orchard.ContentManagement.Drivers; -using Orchard.Core.Feeds; -using Orchard.Localization; namespace Orchard.Blogs.Drivers { [UsedImplicitly] public class BlogPartDriver : ContentPartDriver { - 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) { return Combined( ContentShape("Parts_Blogs_Blog_Manage", @@ -40,24 +14,6 @@ namespace Orchard.Blogs.Drivers { () => shapeHelper.Parts_Blogs_Blog_Description(ContentPart: part, Description: part.Description)), ContentShape("Parts_Blogs_Blog_BlogPostCount", () => 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); - // }) ); } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostPartDriver.cs index 61f1f6976..b17bba836 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostPartDriver.cs @@ -3,24 +3,16 @@ using Orchard.Blogs.Models; using Orchard.Blogs.Extensions; using Orchard.ContentManagement.Drivers; using Orchard.Core.Feeds; -using Orchard.Localization; namespace Orchard.Blogs.Drivers { [UsedImplicitly] public class BlogPostPartDriver : ContentPartDriver { private readonly IFeedManager _feedManager; - public IOrchardServices Services { get; set; } - public BlogPostPartDriver(IOrchardServices services, IFeedManager feedManager) { + public BlogPostPartDriver(IFeedManager 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) { if (displayType.StartsWith("Detail")) _feedManager.Register(part.BlogPart); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs index b00847f66..93b16f16e 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs @@ -60,8 +60,8 @@ namespace Orchard.Blogs.Drivers { if (updater.TryUpdateModel(viewModel, Prefix, null, null)) { part.ForBlog = viewModel.Path; part.Count = viewModel.Count; - } - + } + return Editor(part, shapeHelper); } }