yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

It hurts having to do this, but Sebastiaan says I have to. So re-wiring the BulkPublishController to use the legacy Document class so legacy events are also fired.

Browse Source
This commit is contained in:
Morten Christensen
2013-06-27 12:30:16 +02:00
parent b1db99f639
commit 59ff4a0484
2 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web/WebServices/BulkPublishController.cs
View File

@@ -8,6 +8,7 @@ using Umbraco.Core.Publishing;
using Umbraco.Core.Services;
using Umbraco.Web.Mvc;
using umbraco;
using umbraco.cms.businesslogic.web;
namespace Umbraco.Web.WebServices
{
@@ -26,11 +27,13 @@ namespace Umbraco.Web.WebServices
[HttpPost]
public JsonResult PublishDocument(int documentId, bool publishDescendants, bool includeUnpublished)
{
var doc = Services.ContentService.GetById(documentId);
var contentService = (ContentService) Services.ContentService;
if (!publishDescendants)
var content = Services.ContentService.GetById(documentId);
var doc = new Document(content);
//var contentService = (ContentService) Services.ContentService;
if (publishDescendants == false)
{
var result = contentService.SaveAndPublishInternal(doc);
//var result = contentService.SaveAndPublishInternal(content);
var result = doc.SaveAndPublish(UmbracoUser.Id);
return Json(new
{
success = result.Success,
@@ -39,13 +42,14 @@ namespace Umbraco.Web.WebServices
}
else
{
var result = ((ContentService) Services.ContentService)
.PublishWithChildrenInternal(doc, UmbracoUser.Id, includeUnpublished)
.ToArray();
/*var result = ((ContentService) Services.ContentService)
.PublishWithChildrenInternal(content, UmbracoUser.Id, includeUnpublished)
.ToArray();*/
var result = doc.PublishWithSubs(UmbracoUser.Id, includeUnpublished);
return Json(new
{
success = result.All(x => x.Success),
message = GetMessageForStatuses(result.Select(x => x.Result), doc)
message = GetMessageForStatuses(result.Select(x => x.Result), content)
});
}
}
@@ -63,7 +67,7 @@ namespace Umbraco.Web.WebServices
foreach (var msg in statuses
.Where(x => ((int)x.StatusType) >= 10)
.Select(GetMessageForStatus)
.Where(msg => !msg.IsNullOrWhiteSpace()))
.Where(msg => msg.IsNullOrWhiteSpace() == false))
{
sb.AppendLine(msg.Trim());
}