From 7dfd684cd89a7612af25f5ffecde97aa20176965 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 14 Nov 2013 22:25:08 +1100 Subject: [PATCH] Fixes: U4-3504 Sorting media doesn't work, always defaults to sorting the root --- src/Umbraco.Web/Models/Trees/MenuItemExtensions.cs | 2 +- src/Umbraco.Web/Trees/MediaTreeController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/Models/Trees/MenuItemExtensions.cs b/src/Umbraco.Web/Models/Trees/MenuItemExtensions.cs index 2737639223..05ae312cbd 100644 --- a/src/Umbraco.Web/Models/Trees/MenuItemExtensions.cs +++ b/src/Umbraco.Web/Models/Trees/MenuItemExtensions.cs @@ -92,7 +92,7 @@ namespace Umbraco.Web.Models.Trees private static void SetActionUrl(this MenuItem menuItem, string url, ActionUrlMethod method = ActionUrlMethod.Dialog) { menuItem.AdditionalData[ActionUrlKey] = url; - menuItem.AdditionalData[ActionUrlMethodKey] = url; + menuItem.AdditionalData[ActionUrlMethodKey] = method; } internal static void ConvertLegacyMenuItem(this MenuItem menuItem, IUmbracoEntity item, string nodeType, string currentSection) diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs index e8283b0f90..fa247eb87d 100644 --- a/src/Umbraco.Web/Trees/MediaTreeController.cs +++ b/src/Umbraco.Web/Trees/MediaTreeController.cs @@ -100,7 +100,7 @@ namespace Umbraco.Web.Trees menu.Items.Add(ui.Text("actions", ActionNew.Instance.Alias)); menu.Items.Add(ui.Text("actions", ActionMove.Instance.Alias)); menu.Items.Add(ui.Text("actions", ActionDelete.Instance.Alias)); - menu.Items.Add(ui.Text("actions", ActionSort.Instance.Alias)).ConvertLegacyMenuItem(null, "media", "media"); + menu.Items.Add(ui.Text("actions", ActionSort.Instance.Alias)).ConvertLegacyMenuItem(item, "media", "media"); menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); //if the media item is in the recycle bin, don't have a default menu, just show the regular menu