From f6b3f02dd2f5b69f87135f9c06ebf4577bbf9b2b Mon Sep 17 00:00:00 2001 From: pgregorynz Date: Mon, 10 Dec 2012 00:36:00 -1000 Subject: [PATCH] Fixes U4-580 Send To Publish permission ignored on Content Editor Screen --- .../umbraco/editContent.aspx.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs index 36c89a065b..7183728677 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs @@ -86,7 +86,19 @@ namespace umbraco.cms.presentation // Check publishing permissions if (!base.getUser().GetPermissions(_document.Path).Contains(ActionPublish.Instance.Letter.ToString())) - _canPublish = controls.ContentControl.publishModes.SendToPublish; + { + // Check to see if the user has send to publish permissions + if (!base.getUser().GetPermissions(_document.Path).Contains(ActionToPublish.Instance.Letter.ToString())) + { + //If no send to publish permission then revert to NoPublish mode + _canPublish = controls.ContentControl.publishModes.NoPublish; + } + else + { + _canPublish = controls.ContentControl.publishModes.SendToPublish; + } + } + cControl = new controls.ContentControl(_document, _canPublish, "TabView1"); cControl.ID = "TabView1"; @@ -448,8 +460,8 @@ namespace umbraco.cms.presentation private void addPreviewButton(uicontrols.ScrollingMenu menu, int id) { - menu.InsertSplitter(2); - uicontrols.MenuIconI menuItem = menu.NewIcon(3); + menu.InsertSplitter(); + uicontrols.MenuIconI menuItem = menu.NewIcon(); menuItem.ImageURL = SystemDirectories.Umbraco + "/images/editor/vis.gif"; // Fix for U4-682, if there's no template, disable the preview button if (_document.Template != -1)