From 824b5ad5a4ae1c069b8b649c5b3b2f8b3238d2d6 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 11 Jul 2013 17:04:30 +1000 Subject: [PATCH] Fixes issue with showing the recycle bin menu --- src/Umbraco.Web/Trees/LegacyTreeApiController.cs | 9 ++++++++- src/Umbraco.Web/Trees/MenuItem.cs | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web/Trees/LegacyTreeApiController.cs b/src/Umbraco.Web/Trees/LegacyTreeApiController.cs index be8b07dc46..858f721917 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeApiController.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeApiController.cs @@ -56,8 +56,15 @@ namespace Umbraco.Web.Trees var parentId = queryStrings.GetRequiredString("parentId"); var tree = GetTree(queryStrings); + var rootIds = new[] + { + Core.Constants.System.Root.ToString(CultureInfo.InvariantCulture), + Core.Constants.System.RecycleBinContent.ToString(CultureInfo.InvariantCulture), + Core.Constants.System.RecycleBinMedia.ToString(CultureInfo.InvariantCulture) + }; + //if the id and the parentId are both -1 then we need to get the menu for the root node - if (id == "-1" && parentId == "-1") + if (rootIds.Contains(id) && parentId == "-1") { var attempt = tree.TryGetMenuFromLegacyTreeRootNode(queryStrings, Url); if (attempt.Success == false) diff --git a/src/Umbraco.Web/Trees/MenuItem.cs b/src/Umbraco.Web/Trees/MenuItem.cs index 1178dd4cbf..30c3d9d321 100644 --- a/src/Umbraco.Web/Trees/MenuItem.cs +++ b/src/Umbraco.Web/Trees/MenuItem.cs @@ -48,10 +48,10 @@ namespace Umbraco.Web.Trees public string Icon { get; set; } /// - /// The action to execute when the menu item is clicked. This is generally a route path. + /// The view to render when the menu item is clicked. This is generally a route path. /// - [DataMember(Name = "action")] - public string Action { get; set; } + [DataMember(Name = "view")] + public string View { get; set; } }