From 0cb9f7e2da13af4e1e8a96bddbc080c02e3d6ad4 Mon Sep 17 00:00:00 2001
From: Suha Can <Suha.Can@microsoft.com>
Date: Mon, 1 Mar 2010 15:42:47 -0800
Subject: [PATCH] - Fixing 16236: Menu text required even if "Add to menu"
 checkbox is unchecked Title is required

--HG--
branch : dev
---
 .../Core/Navigation/Drivers/MenuPartDriver.cs            | 9 ++++++++-
 src/Orchard.Web/Core/Navigation/Models/MenuPart.cs       | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs b/src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs
index 74c057ec0..21c7cfa71 100644
--- a/src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs
+++ b/src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs
@@ -1,7 +1,9 @@
-using JetBrains.Annotations;
+using System;
+using JetBrains.Annotations;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Core.Navigation.Models;
+using Orchard.Localization;
 using Orchard.Security;
 using Orchard.UI.Navigation;
 using Orchard.Utility;
@@ -15,9 +17,11 @@ namespace Orchard.Core.Navigation.Drivers {
         public MenuPartDriver(IAuthorizationService authorizationService, INavigationManager navigationManager) {
             _authorizationService = authorizationService;
             _navigationManager = navigationManager;
+            T = NullLocalizer.Instance;
         }
 
         public virtual IUser CurrentUser { get; set; }
+        private Localizer T { get; set; }
 
         protected override DriverResult Editor(MenuPart part) {
             if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, CurrentUser, part))
@@ -34,6 +38,9 @@ namespace Orchard.Core.Navigation.Drivers {
                 part.MenuPosition = Position.GetNext(_navigationManager.BuildMenu("main"));
 
             updater.TryUpdateModel(part, Prefix, null, null);
+            if (part.OnMainMenu && String.IsNullOrEmpty(part.MenuText)) {
+                updater.AddModelError("MenuText", T("The MenuText field is required"));
+            }
             return ContentPartTemplate(part, "Parts/Navigation.EditMenuPart").Location("primary", "9");
         }
     }
diff --git a/src/Orchard.Web/Core/Navigation/Models/MenuPart.cs b/src/Orchard.Web/Core/Navigation/Models/MenuPart.cs
index 120eb2f42..952f7c160 100644
--- a/src/Orchard.Web/Core/Navigation/Models/MenuPart.cs
+++ b/src/Orchard.Web/Core/Navigation/Models/MenuPart.cs
@@ -13,7 +13,6 @@ namespace Orchard.Core.Navigation.Models {
             set { Record.OnMainMenu = value; }
         }
 
-        [Required]
         public string MenuText {
             get { return Record.MenuText; }
             set { Record.MenuText = value; }