lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#19135: Fixing menu item hirerachies deletion

Browse Source 
Work Item: 19135

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-10-16 17:43:36 -07:00
parent 4386060607
commit 5223f74571
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
View File

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