mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Making content publish if publishing isn't already handled by another part (explicitly checking for the CommonAspect at the moment)
--HG-- branch : dev
This commit is contained in:
@@ -4,6 +4,7 @@ using System.Web.Mvc;
|
|||||||
using System.Web.Routing;
|
using System.Web.Routing;
|
||||||
using Orchard.ContentManagement;
|
using Orchard.ContentManagement;
|
||||||
using Orchard.ContentManagement.MetaData;
|
using Orchard.ContentManagement.MetaData;
|
||||||
|
using Orchard.Core.Common.Models;
|
||||||
using Orchard.Core.Contents.ViewModels;
|
using Orchard.Core.Contents.ViewModels;
|
||||||
using Orchard.Data;
|
using Orchard.Data;
|
||||||
using Orchard.Localization;
|
using Orchard.Localization;
|
||||||
@@ -110,16 +111,22 @@ namespace Orchard.Core.Contents.Controllers {
|
|||||||
//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);
|
||||||
model.Content = _contentManager.UpdateEditorModel(contentItem, this);
|
model.Content = _contentManager.UpdateEditorModel(contentItem, this);
|
||||||
|
|
||||||
if (ModelState.IsValid) {
|
if (ModelState.IsValid) {
|
||||||
_contentManager.Create(contentItem, VersionOptions.Draft);
|
_contentManager.Create(contentItem, VersionOptions.Draft);
|
||||||
model.Content = _contentManager.UpdateEditorModel(contentItem, this);
|
model.Content = _contentManager.UpdateEditorModel(contentItem, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ModelState.IsValid) {
|
if (!ModelState.IsValid) {
|
||||||
_transactionManager.Cancel();
|
_transactionManager.Cancel();
|
||||||
PrepareEditorViewModel(model.Content);
|
PrepareEditorViewModel(model.Content);
|
||||||
return View("Create", model);
|
return View("Create", model);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//need to go about this differently - to know when to publish (IPlublishableAspect ?)
|
||||||
|
if (!contentItem.Has<CommonAspect>())
|
||||||
|
_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 } });
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user