From cfb11c92ae521b05780fda222746cbcc8a24549e Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Wed, 10 Nov 2010 16:36:54 -0800 Subject: [PATCH] Removing the "Content Item" content type admin menu item (under "New") since it's not really a content type --HG-- branch : dev --- src/Orchard.Web/Core/Contents/AdminMenu.cs | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/Orchard.Web/Core/Contents/AdminMenu.cs b/src/Orchard.Web/Core/Contents/AdminMenu.cs index e1f49f33b..f3bb709c3 100644 --- a/src/Orchard.Web/Core/Contents/AdminMenu.cs +++ b/src/Orchard.Web/Core/Contents/AdminMenu.cs @@ -24,17 +24,19 @@ namespace Orchard.Core.Contents { builder.Add(T("Content"), "2", menu => menu.Add(T("Content Items"), "1", item => item.Action("List", "Admin", new {area = "Contents", id = ""}))); - builder.Add(T("New"), "-1", menu => { - menu.Add(T("Content Item"), "1", item => item.Action("List", "Admin", new { area = "Contents", id = "" })); - foreach (var contentTypeDefinition in contentTypeDefinitions.Where(ctd => ctd.Settings.GetModel().Creatable).OrderBy(ctd => ctd.DisplayName)) { - var ci = _contentManager.New(contentTypeDefinition.Name); - var cim = _contentManager.GetItemMetadata(ci); - var createRouteValues = cim.CreateRouteValues; - // review: the display name should be a LocalizedString - if (createRouteValues.Any()) - menu.Add(T(contentTypeDefinition.DisplayName), "5", item => item.Action(cim.CreateRouteValues["Action"] as string, cim.CreateRouteValues["Controller"] as string, cim.CreateRouteValues)); - } - }); + var contentTypes = contentTypeDefinitions.Where(ctd => ctd.Settings.GetModel().Creatable).OrderBy(ctd => ctd.DisplayName); + if (contentTypes.Count() > 0) { + builder.Add(T("New"), "-1", menu => { + foreach (var contentTypeDefinition in contentTypes) { + var ci = _contentManager.New(contentTypeDefinition.Name); + var cim = _contentManager.GetItemMetadata(ci); + var createRouteValues = cim.CreateRouteValues; + // review: the display name should be a LocalizedString + if (createRouteValues.Any()) + menu.Add(T(contentTypeDefinition.DisplayName), "5", item => item.Action(cim.CreateRouteValues["Action"] as string, cim.CreateRouteValues["Controller"] as string, cim.CreateRouteValues)); + } + }); + } } } } \ No newline at end of file