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

Fix U4-84 - Error message when publish is cancelled by event:

Browse Source 
http://issues.umbraco.org/issue/U4-84
This commit is contained in:
Darren@Darren-VAIO
2012-06-28 08:45:46 -01:00
parent a529c26189
commit 82ee608c92
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/umbraco.presentation/umbraco/dialogs/publish.aspx.cs
View File

@@ -111,7 +111,7 @@ namespace umbraco.dialogs
feedbackMsg.Text = ui.Text("publish", "nodePublish", d.Text, base.getUser()) + "</p><p><a href='#' onclick='" + ClientTools.Scripts.CloseModalWindow() + "'>" + ui.Text("closeThisWindow") + "</a>";
}
else {
feedbackMsg.type = umbraco.uicontrols.Feedback.feedbacktype.error;
feedbackMsg.type = umbraco.uicontrols.Feedback.feedbacktype.notice;
feedbackMsg.Text = ui.Text("publish", "contentPublishedFailedByEvent", d.Text, base.getUser()) + "</p><p><a href='#' onClick='" + ClientTools.Scripts.CloseModalWindow() + "'>" + ui.Text("closeThisWindow") + "</a>";
}
ClientTools.ReloadActionNode(true, false);

4
src/umbraco.presentation/umbraco/editContent.aspx.cs
View File

@@ -322,11 +322,11 @@ namespace umbraco.cms.presentation
}
else
{
ClientTools.ShowSpeechBubble(speechBubbleIcon.error, ui.Text("error"), ui.Text("contentPublishedFailedByEvent"));
ClientTools.ShowSpeechBubble(speechBubbleIcon.warning, ui.Text("publish"), ui.Text("contentPublishedFailedByEvent"));
}
}
else
ClientTools.ShowSpeechBubble(speechBubbleIcon.error, ui.Text("error"), ui.Text("speechBubbles", "editContentPublishedFailedByParent"));
ClientTools.ShowSpeechBubble(speechBubbleIcon.warning, ui.Text("publish"), ui.Text("speechBubbles", "editContentPublishedFailedByParent"));
// page cache disabled...
// cms.businesslogic.cache.Cache.ClearCacheObjectTypes("umbraco.page");