From 836297df583340724563350656fb0ac18909de26 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 15 May 2014 13:35:52 +1000 Subject: [PATCH] Fixes error message on publishing when it fails due to any of these statuses: FailedHasExpired, FailedAwaitingRelease, FailedIsTrashed --- src/Umbraco.Web/WebServices/BulkPublishController.cs | 2 +- .../umbraco.presentation/umbraco/actions/publish.aspx.cs | 1 + .../umbraco.presentation/umbraco/editContent.aspx.cs | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/WebServices/BulkPublishController.cs b/src/Umbraco.Web/WebServices/BulkPublishController.cs index 2c18a6df2c..30a609f6ff 100644 --- a/src/Umbraco.Web/WebServices/BulkPublishController.cs +++ b/src/Umbraco.Web/WebServices/BulkPublishController.cs @@ -87,7 +87,7 @@ namespace Umbraco.Web.WebServices case PublishStatusType.FailedHasExpired: case PublishStatusType.FailedAwaitingRelease: case PublishStatusType.FailedIsTrashed: - return ""; //we will not notify about this type of failure... or should we ? + 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); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs index 928ac680a6..a505f3cb69 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs @@ -70,6 +70,7 @@ namespace umbraco.presentation.actions case PublishStatusType.FailedHasExpired: case PublishStatusType.FailedAwaitingRelease: case PublishStatusType.FailedIsTrashed: + return "Cannot publish document with a status of " + status.StatusType; case PublishStatusType.FailedContentInvalid: return ui.Text("publish", "contentPublishedFailedInvalid", new[] diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs index 3af648c142..bf12e4d931 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs @@ -341,6 +341,11 @@ namespace umbraco.cms.presentation case PublishStatusType.FailedHasExpired: case PublishStatusType.FailedAwaitingRelease: case PublishStatusType.FailedIsTrashed: + ClientTools.ShowSpeechBubble( + speechBubbleIcon.warning, + ui.Text("publish"), + "Cannot publish document with a status of " + status.StatusType); + break; case PublishStatusType.FailedContentInvalid: ClientTools.ShowSpeechBubble( speechBubbleIcon.warning,