From 5223f7457187eb2c0d56a12af13c03a7ba51940e Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Tue, 16 Oct 2012 17:43:36 -0700
Subject: [PATCH] #19135: Fixing menu item hirerachies deletion

Work Item: 19135

--HG--
branch : 1.x
---
 .../Navigation/Controllers/AdminController.cs | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs b/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
index a3617fc95..5848091b7 100644
--- a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Web.Mvc;
 using System.Web.Routing;
@@ -117,13 +118,22 @@ namespace Orchard.Core.Navigation.Controllers {
             if (menuPart != null) {
                 menuId = menuPart.Menu.Id;
 
-                // if the menu item is a concrete content item, don't delete it, just unreference the menu
-                if (!menuPart.ContentItem.TypeDefinition.Settings.ContainsKey("Stereotype") || menuPart.ContentItem.TypeDefinition.Settings["Stereotype"] != "MenuItem") {
-                    menuPart.Menu = null;
-                }
-                else {
-                    _menuService.Delete(menuPart);
+                // get all sub-menu items from the same menu
+                var menuItems = _menuService.GetMenuParts(menuPart.Menu.Id)
+                    .Where(x => x.MenuPosition.StartsWith(menuPart.MenuPosition + "."))
+                    .Select(x => x.As<MenuPart>())
+                    .ToList();
+
+                foreach (var menuItem in menuItems.Concat(new [] {menuPart})) {
+                    // if the menu item is a concrete content item, don't delete it, just unreference the menu
+                    if (!menuPart.ContentItem.TypeDefinition.Settings.ContainsKey("Stereotype") || menuPart.ContentItem.TypeDefinition.Settings["Stereotype"] != "MenuItem") {
+                        menuPart.Menu = null;
+                    }
+                    else {
+                        _menuService.Delete(menuItem);
+                    }
                 }
+
             }
 
             return RedirectToAction("Index", new { menuId });