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

Fixes error message on publishing when it fails due to any of these statuses: FailedHasExpired, FailedAwaitingRelease, FailedIsTrashed

Browse Source
This commit is contained in:
Shannon
2014-05-15 13:35:52 +10:00
parent 78613823ae
commit 836297df58
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

1
src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs
View File

@@ -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[]

5
src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
View File

@@ -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,