From 6c1e271fa8f1298c408b489e751cf7b0e60c801d Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 23 Mar 2017 11:27:46 +1100 Subject: [PATCH] Fixes styling and fixing error message quotes to make it more clear --- src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx | 2 +- src/Umbraco.Web/WebServices/BulkPublishController.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx index e86108616d..d6b6936144 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx @@ -80,7 +80,7 @@
-
+
  • diff --git a/src/Umbraco.Web/WebServices/BulkPublishController.cs b/src/Umbraco.Web/WebServices/BulkPublishController.cs index cc9a153e07..e477db539a 100644 --- a/src/Umbraco.Web/WebServices/BulkPublishController.cs +++ b/src/Umbraco.Web/WebServices/BulkPublishController.cs @@ -46,16 +46,16 @@ namespace Umbraco.Web.WebServices /*var result = ((ContentService) Services.ContentService) .PublishWithChildrenInternal(content, UmbracoUser.Id, includeUnpublished) .ToArray();*/ - var result = doc.PublishWithSubs(UmbracoUser.Id, includeUnpublished); + var result = doc.PublishWithSubs(UmbracoUser.Id, includeUnpublished).ToArray(); return Json(new { success = result.All(x => x.Success), - message = GetMessageForStatuses(result.Select(x => x.Result), content) + message = GetMessageForStatuses(result.Select(x => x.Result).ToArray(), content) }); } } - private string GetMessageForStatuses(IEnumerable statuses, IContent doc) + private string GetMessageForStatuses(PublishStatus[] statuses, IContent doc) { //if all are successful then just say it was successful if (statuses.All(x => ((int) x.StatusType) < 10)) @@ -91,12 +91,12 @@ namespace Umbraco.Web.WebServices return "Cannot publish document with a status of " + status.StatusType; case PublishStatusType.FailedCancelledByEvent: return ui.Text("publish", "contentPublishedFailedByEvent", - string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id), UmbracoUser); + string.Format("'{0}' ({1})", status.ContentItem.Name, status.ContentItem.Id), UmbracoUser); case PublishStatusType.FailedContentInvalid: return ui.Text("publish", "contentPublishedFailedInvalid", new []{ - string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id), - string.Join(",", status.InvalidProperties.Select(x => x.Alias)) + string.Format("'{0}' ({1})", status.ContentItem.Name, status.ContentItem.Id), + string.Format("'{0}'", string.Join(", ", status.InvalidProperties.Select(x => x.Alias))) }, UmbracoUser); default: