lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-22 20:13:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Hooked up publish later option for blogs and pages. Code is fairly duplicated at the moment. Added todo comments in marking the duplicated code to evaluate for pulling back into content manager.

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045266
This commit is contained in:
ErikPorter
2010-01-12 01:04:11 +00:00
parent 00deaecd41
commit acd5bdcb5d
12 changed files with 104 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostAdminController.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Web.Mvc;
using Orchard.Blogs.Extensions;
using Orchard.Blogs.Models;
@@ -11,6 +12,7 @@ using Orchard.Mvc.Results;
using Orchard.UI.Notify;
namespace Orchard.Blogs.Controllers {
[ValidateInput(false)]
public class BlogPostAdminController : Controller, IUpdateModel {
private readonly IOrchardServices _services;
private readonly IBlogService _blogService;
@@ -59,12 +61,25 @@ namespace Orchard.Blogs.Controllers {
if (blog == null)
return new NotFoundResult();
//TODO: (erikpo) Move this duplicate code somewhere else
DateTime? publishDate = null;
bool publishNow = false;
if (string.Equals(Request.Form["Command"], "PublishNow")) {
publishNow = true;
} else if (string.Equals(Request.Form["Publish"], "Publish")) {
DateTime publishDateValue;
if (DateTime.TryParse(Request.Form["Publish"], out publishDateValue)) {
publishDate = publishDateValue;
}
}
BlogPost blogPost = _services.ContentManager.Create<BlogPost>("blogpost", publishNow ? VersionOptions.Published : VersionOptions.Draft, bp => { bp.Blog = blog; });
//TODO: (erikpo) Evaluate if publish options should be moved into create or out of create to keep it clean
BlogPost blogPost = _services.ContentManager.Create<BlogPost>("blogpost", publishNow ? VersionOptions.Published : VersionOptions.Draft,
bp => {
bp.Blog = blog;
if (!publishNow && publishDate != null)
bp.Published = publishDate.Value;
});
model.BlogPost = _services.ContentManager.UpdateEditorModel(blogPost, this);
if (!ModelState.IsValid) {
@@ -117,14 +132,24 @@ namespace Orchard.Blogs.Controllers {
if (post == null)
return new NotFoundResult();
//TODO: (erikpo) Move this duplicate code somewhere else
DateTime? publishDate = null;
bool publishNow = false;
if (string.Equals(Request.Form["Command"], "PublishNow")) {
publishNow = true;
} else if (string.Equals(Request.Form["Publish"], "Publish")) {
DateTime publishDateValue;
if (DateTime.TryParse(Request.Form["Publish"], out publishDateValue)) {
publishDate = publishDateValue;
}
}
//TODO: (erikpo) Move this duplicate code somewhere else
if (publishNow)
_blogPostService.Publish(post);
else if (publishDate != null)
_blogPostService.Publish(post, publishDate.Value);
else
_blogPostService.Unpublish(post);