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

Fixed content publishing on creation

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-07-16 11:40:22 -07:00
parent 3cb376b929
commit 1f632119c0
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
View File

@@ -110,6 +110,7 @@ namespace Orchard.Core.Contents.Controllers {
public ActionResult Create(CreateItemViewModel model) { public ActionResult Create(CreateItemViewModel model) {
//todo: need to integrate permissions into generic content management //todo: need to integrate permissions into generic content management
var contentItem = _contentManager.New(model.Id); var contentItem = _contentManager.New(model.Id);
_contentManager.Create(contentItem, VersionOptions.Draft);
model.Content = _contentManager.UpdateEditorModel(contentItem, this); model.Content = _contentManager.UpdateEditorModel(contentItem, this);
if (!ModelState.IsValid) { if (!ModelState.IsValid) {
@@ -118,13 +119,11 @@ namespace Orchard.Core.Contents.Controllers {
return View("Create", model); return View("Create", model);
} }
_contentManager.Create(contentItem, VersionOptions.Draft); if (!contentItem.Has<IPublishingControlAspect>()) {
//need to go about this differently - to know when to publish (IPlublishableAspect ?)
if (!contentItem.Has<IPublishingControlAspect>())
_contentManager.Publish(contentItem); _contentManager.Publish(contentItem);
_notifier.Information(T("Created content item")); _notifier.Information(T("Created content item"));
}
return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } }); return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } });
} }

4
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs
View File

@@ -53,6 +53,7 @@ namespace Orchard.Blogs.Controllers {
if (blogPost.Blog == null) if (blogPost.Blog == null)
return new NotFoundResult(); return new NotFoundResult();
Services.ContentManager.Create(blogPost, VersionOptions.Draft);
model.BlogPost = Services.ContentManager.UpdateEditorModel(blogPost, this); model.BlogPost = Services.ContentManager.UpdateEditorModel(blogPost, this);
if (!ModelState.IsValid) { if (!ModelState.IsValid) {
@@ -60,9 +61,6 @@ namespace Orchard.Blogs.Controllers {
return View(model); return View(model);
} }
Services.ContentManager.Create(model.BlogPost.Item.ContentItem, VersionOptions.Draft);
Services.ContentManager.UpdateEditorModel(blogPost, this);
return Redirect(Url.BlogPostEdit(model.BlogPost.Item)); return Redirect(Url.BlogPostEdit(model.BlogPost.Item));
} }

1
src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs
View File

@@ -82,7 +82,6 @@ namespace Orchard.Blogs.Drivers {
} }
protected override DriverResult Editor(BlogPost post, IUpdateModel updater) { protected override DriverResult Editor(BlogPost post, IUpdateModel updater) {
updater.TryUpdateModel(post, Prefix, null, null);
return Editor(post); return Editor(post);
} }
} }