From 1f632119c021bd94871c6a83d922d9fccc8af904 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Fri, 16 Jul 2010 11:40:22 -0700 Subject: [PATCH] Fixed content publishing on creation --HG-- branch : dev --- .../Core/Contents/Controllers/AdminController.cs | 9 ++++----- .../Orchard.Blogs/Controllers/BlogPostAdminController.cs | 4 +--- .../Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs index c0a88aaad..814f7f052 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs @@ -110,6 +110,7 @@ namespace Orchard.Core.Contents.Controllers { public ActionResult Create(CreateItemViewModel model) { //todo: need to integrate permissions into generic content management var contentItem = _contentManager.New(model.Id); + _contentManager.Create(contentItem, VersionOptions.Draft); model.Content = _contentManager.UpdateEditorModel(contentItem, this); if (!ModelState.IsValid) { @@ -118,13 +119,11 @@ namespace Orchard.Core.Contents.Controllers { return View("Create", model); } - _contentManager.Create(contentItem, VersionOptions.Draft); - - //need to go about this differently - to know when to publish (IPlublishableAspect ?) - if (!contentItem.Has()) + if (!contentItem.Has()) { _contentManager.Publish(contentItem); + _notifier.Information(T("Created content item")); + } - _notifier.Information(T("Created content item")); return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } }); } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs index 6c9f0a8f1..c675a6469 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs @@ -53,6 +53,7 @@ namespace Orchard.Blogs.Controllers { if (blogPost.Blog == null) return new NotFoundResult(); + Services.ContentManager.Create(blogPost, VersionOptions.Draft); model.BlogPost = Services.ContentManager.UpdateEditorModel(blogPost, this); if (!ModelState.IsValid) { @@ -60,9 +61,6 @@ namespace Orchard.Blogs.Controllers { return View(model); } - Services.ContentManager.Create(model.BlogPost.Item.ContentItem, VersionOptions.Draft); - Services.ContentManager.UpdateEditorModel(blogPost, this); - return Redirect(Url.BlogPostEdit(model.BlogPost.Item)); } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs index 258217d7d..400d0598f 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs @@ -82,7 +82,6 @@ namespace Orchard.Blogs.Drivers { } protected override DriverResult Editor(BlogPost post, IUpdateModel updater) { - updater.TryUpdateModel(post, Prefix, null, null); return Editor(post); } }