lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Some work towards moving the content publish editor over to the common part

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-07-13 10:14:46 -07:00
parent 501d72afab
commit 7c11b79b7d
67 changed files with 208 additions and 6247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@ using System.Web.Mvc;
using System.Web.Routing;
using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData;
using Orchard.Core.Contents.Services;
using Orchard.Core.Contents.ViewModels;
using Orchard.Data;
using Orchard.Localization;
@@ -20,21 +19,18 @@ namespace Orchard.Core.Contents.Controllers {
private readonly IContentManager _contentManager;
private readonly IContentDefinitionManager _contentDefinitionManager;
private readonly ITransactionManager _transactionManager;
private readonly IContentsService _contentsService;
public AdminController(
IOrchardServices orchardServices,
INotifier notifier,
IContentManager contentManager,
IContentDefinitionManager contentDefinitionManager,
ITransactionManager transactionManager,
IContentsService contentsService) {
ITransactionManager transactionManager) {
Services = orchardServices;
_notifier = notifier;
_contentManager = contentManager;
_contentDefinitionManager = contentDefinitionManager;
_transactionManager = transactionManager;
_contentsService = contentsService;
T = NullLocalizer.Instance;
Logger = NullLogger.Instance;
}
@@ -110,7 +106,7 @@ namespace Orchard.Core.Contents.Controllers {
[HttpPost]
public ActionResult Create(CreateItemViewModel model, string command, DateTime? scheduledPublishUtc) {
public ActionResult Create(CreateItemViewModel model) {
//todo: need to integrate permissions into generic content management
var contentItem = _contentManager.New(model.Id);
model.Content = _contentManager.UpdateEditorModel(contentItem, this);
@@ -124,20 +120,6 @@ namespace Orchard.Core.Contents.Controllers {
return View("Create", model);
}
switch (command) {
case "PublishNow":
_contentsService.Publish(model.Content.Item);
Services.Notifier.Information(T("{0} has been published", contentItem.TypeDefinition.DisplayName));
break;
case "PublishLater":
_contentsService.Publish(model.Content.Item, scheduledPublishUtc.HasValue ? scheduledPublishUtc.Value : DateTime.MaxValue);
Services.Notifier.Information(T("{0} has been scheduled for publishing", contentItem.TypeDefinition.DisplayName));
break;
default:
Services.Notifier.Information(T("{0} draft has been saved", contentItem.TypeDefinition.DisplayName));
break;
}
_notifier.Information(T("Created content item"));
return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } });
}
@@ -153,7 +135,7 @@ namespace Orchard.Core.Contents.Controllers {
}
[HttpPost]
public ActionResult Edit(EditItemViewModel model, string command, DateTime? scheduledPublishUtc) {
public ActionResult Edit(EditItemViewModel model) {
var contentItem = _contentManager.Get(model.Id, VersionOptions.DraftRequired);
model.Content = _contentManager.UpdateEditorModel(contentItem, this);
if (!ModelState.IsValid) {
@@ -162,20 +144,6 @@ namespace Orchard.Core.Contents.Controllers {
return View("Edit", model);
}
switch (command) {
case "PublishNow":
_contentsService.Publish(model.Content.Item);
Services.Notifier.Information(T("{0} has been published", contentItem.TypeDefinition.DisplayName));
break;
case "PublishLater":
_contentsService.Publish(model.Content.Item, scheduledPublishUtc.HasValue ? scheduledPublishUtc.Value : DateTime.MaxValue);
Services.Notifier.Information(T("{0} has been scheduled for publishing", contentItem.TypeDefinition.DisplayName));
break;
default:
Services.Notifier.Information(T("{0} draft has been saved", contentItem.TypeDefinition.DisplayName));
break;
}
return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } });
}