From 3302c026b69c33da95500d610fdcc7d1d5fa37d3 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 22 Jul 2010 11:34:43 -0700 Subject: [PATCH] BlogPostDriver -> BlogPostPartDriver --HG-- branch : dev rename : src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs => src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostPartDriver.cs --- .../Orchard.Blogs/Controllers/BlogPostAdminController.cs | 4 ++-- .../Drivers/{BlogPostDriver.cs => BlogPostPartDriver.cs} | 4 ++-- .../Modules/Orchard.Blogs/Handlers/BlogArchiveHandler.cs | 2 +- src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj | 2 +- .../Modules/Orchard.Blogs/Services/BlogPostService.cs | 4 ++-- .../Modules/Orchard.Blogs/Services/XmlRpcHandler.cs | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename src/Orchard.Web/Modules/Orchard.Blogs/Drivers/{BlogPostDriver.cs => BlogPostPartDriver.cs} (94%) diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs index 3a3189042..fec3db0bc 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs @@ -31,7 +31,7 @@ namespace Orchard.Blogs.Controllers { if (!Services.Authorizer.Authorize(Permissions.EditBlogPost, T("Not allowed to create blog post"))) return new HttpUnauthorizedResult(); - var blogPost = Services.ContentManager.New(BlogPostDriver.ContentType.Name); + var blogPost = Services.ContentManager.New(BlogPostPartDriver.ContentType.Name); if (blogPost.BlogPart == null) return new NotFoundResult(); @@ -48,7 +48,7 @@ namespace Orchard.Blogs.Controllers { if (!Services.Authorizer.Authorize(Permissions.EditBlogPost, T("Couldn't create blog post"))) return new HttpUnauthorizedResult(); - var blogPost = Services.ContentManager.New(BlogPostDriver.ContentType.Name); + var blogPost = Services.ContentManager.New(BlogPostPartDriver.ContentType.Name); if (blogPost.BlogPart == null) return new NotFoundResult(); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostPartDriver.cs similarity index 94% rename from src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs rename to src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostPartDriver.cs index 2f8fc3229..6c2788582 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostPartDriver.cs @@ -7,7 +7,7 @@ using Orchard.Localization; namespace Orchard.Blogs.Drivers { [UsedImplicitly] - public class BlogPostDriver : ContentItemDriver { + public class BlogPostPartDriver : ContentItemDriver { public IOrchardServices Services { get; set; } public readonly static ContentType ContentType = new ContentType { @@ -15,7 +15,7 @@ namespace Orchard.Blogs.Drivers { DisplayName = "Blog Post" }; - public BlogPostDriver(IOrchardServices services) { + public BlogPostPartDriver(IOrchardServices services) { Services = services; T = NullLocalizer.Instance; } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogArchiveHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogArchiveHandler.cs index 0b0405cb2..e676c5d73 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogArchiveHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogArchiveHandler.cs @@ -29,7 +29,7 @@ namespace Orchard.Blogs.Handlers { //INFO: (erikpo) Get all blog posts for the current blog var postsQuery = from bpr in commonRepository.Table - where bpr.ContentItemRecord.ContentType.Name == BlogPostDriver.ContentType.Name && bpr.Container.Id == blogPostPart.BlogPart.Record.Id + where bpr.ContentItemRecord.ContentType.Name == BlogPostPartDriver.ContentType.Name && bpr.Container.Id == blogPostPart.BlogPart.Record.Id orderby bpr.PublishedUtc select bpr; diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index 29f00f14d..973727be2 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -72,7 +72,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs index 396219a18..646a19bcd 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs @@ -29,7 +29,7 @@ namespace Orchard.Blogs.Services { public BlogPostPart Get(BlogPart blogPart, string slug, VersionOptions versionOptions) { return - _contentManager.Query(versionOptions, BlogPostDriver.ContentType.Name).Join().Where(rr => rr.Slug == slug). + _contentManager.Query(versionOptions, BlogPostPartDriver.ContentType.Name).Join().Where(rr => rr.Slug == slug). Join().Where(cr => cr.Container == blogPart.Record.ContentItemRecord).List(). SingleOrDefault().As(); } @@ -112,7 +112,7 @@ namespace Orchard.Blogs.Services { private IContentQuery GetBlogQuery(ContentPart blog, VersionOptions versionOptions) { return - _contentManager.Query(versionOptions, BlogPostDriver.ContentType.Name).Join().Where( + _contentManager.Query(versionOptions, BlogPostPartDriver.ContentType.Name).Join().Where( cr => cr.Container == blog.Record.ContentItemRecord).OrderByDescending(cr => cr.CreatedUtc); } } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs index 757c60a79..8f68a81e1 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs @@ -159,7 +159,7 @@ namespace Orchard.Blogs.Services { var description = content.Optional("description"); var slug = content.Optional("wp_slug"); - var blogPost = _contentManager.New(BlogPostDriver.ContentType.Name); + var blogPost = _contentManager.New(BlogPostPartDriver.ContentType.Name); blogPost.BlogPart = blog; blogPost.Title = title; blogPost.Slug = slug;