From 02de09eaf7f689119f680f2ddd4a79afe6a88c61 Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 9 Jul 2018 18:26:15 +0200 Subject: [PATCH] Explain last merge --- src/Umbraco.Web/Trees/ContentTreeController.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 4e97292147..0eaa314001 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -48,7 +48,7 @@ namespace Umbraco.Web.Trees protected override TreeNode GetSingleTreeNode(IEntitySlim entity, string parentId, FormDataCollection queryStrings) { var langId = queryStrings?["culture"]; - + var allowedUserOptions = GetAllowedUserMenuItemsForNode(entity); if (CanUserAccessNode(entity, allowedUserOptions, langId)) { @@ -126,6 +126,8 @@ namespace Umbraco.Web.Trees } // add default actions for *all* users + // fixme - temp disable RePublish as the page itself (republish.aspx) has been temp disabled + //menu.Items.Add(Services.TextService.Localize("actions", ActionRePublish.Instance.Alias)).ConvertLegacyMenuItem(null, "content", "content"); menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); return menu; @@ -204,7 +206,7 @@ namespace Umbraco.Web.Trees foreach (var entity in result) EnsureName(entity, cultureVal); - return result; + return result; } ///