From 1e7436a453dc29f78dc4979cfde928134c784c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Sat, 16 Oct 2010 14:37:42 -0700 Subject: [PATCH] Fixed Clay exception with unknown menu entry in MenuItem shapes --HG-- branch : dev --- src/Orchard/UI/Navigation/MenuFilter.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Orchard/UI/Navigation/MenuFilter.cs b/src/Orchard/UI/Navigation/MenuFilter.cs index 14901f4e4..efc437cf9 100644 --- a/src/Orchard/UI/Navigation/MenuFilter.cs +++ b/src/Orchard/UI/Navigation/MenuFilter.cs @@ -30,23 +30,24 @@ namespace Orchard.UI.Navigation { var menuItems = _navigationManager.BuildMenu(menuName); var menuShape = _shapeFactory.Menu().MenuName(menuName); - PopulateMenu(_shapeFactory, menuShape, menuItems); + PopulateMenu(_shapeFactory, menuShape, menuShape, menuItems); workContext.Layout.Navigation.Add(menuShape); } - private void PopulateMenu(dynamic shapeFactory, dynamic parentShape, IEnumerable menuItems) { + private void PopulateMenu(dynamic shapeFactory, dynamic parentShape, dynamic menu, IEnumerable menuItems) { + foreach (var menuItem in menuItems) { var menuItemShape = shapeFactory.MenuItem() .Text(menuItem.Text) .Href(menuItem.Href) .RouteValues(menuItem.RouteValues) .Item(menuItem) - .Menu(shapeFactory) + .Menu(menu) .Parent(parentShape); if (menuItem.Items != null && menuItem.Items.Any()) { - PopulateMenu(shapeFactory, menuItemShape, menuItem.Items); + PopulateMenu(shapeFactory, menuItemShape, menu, menuItem.Items); } parentShape.Add(menuItemShape, menuItem.Position);