From 32683280dfb4ae3fd8031c1b05b95bf80c77cf0a Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Tue, 16 Feb 2010 14:33:18 -0800 Subject: [PATCH] Changing the Main Menu manage form to treat MenuItems differently (editable URL) --HG-- branch : dev --- .../Core/Navigation/Controllers/AdminController.cs | 5 +++-- src/Orchard.Web/Core/Navigation/ViewModels/MenuItemEntry.cs | 1 + src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs b/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs index 7ebd52c5c..6be061701 100644 --- a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs @@ -65,9 +65,10 @@ namespace Orchard.Core.Navigation.Controllers { MenuItem = new UI.Navigation.MenuItem { Text = menuPart.MenuText, Position = menuPart.MenuPosition, - Url = menuPart.As().Url + Url = menuPart.Is() ? menuPart.As().Url : "menu part url" }, - MenuItemId = menuPart.Id + MenuItemId = menuPart.Id, + IsMenuItem = menuPart.Is() }; } diff --git a/src/Orchard.Web/Core/Navigation/ViewModels/MenuItemEntry.cs b/src/Orchard.Web/Core/Navigation/ViewModels/MenuItemEntry.cs index 94388a1e6..dd71b76fd 100644 --- a/src/Orchard.Web/Core/Navigation/ViewModels/MenuItemEntry.cs +++ b/src/Orchard.Web/Core/Navigation/ViewModels/MenuItemEntry.cs @@ -4,5 +4,6 @@ namespace Orchard.Core.Navigation.ViewModels { public class MenuItemEntry { public MenuItem MenuItem { get; set; } public int MenuItemId { get; set; } + public bool IsMenuItem { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx index 3765c67ea..d0df20472 100644 --- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx @@ -26,7 +26,7 @@ using (Html.BeginFormAntiForgeryPost()) { %> - + <% if (!menuPartEntry.IsMenuItem) { %><% } else { %><% } %> " class="remove button">delete <% ++menuPartEntryIndex;