lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-22 20:13:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

- Fixing 16236: Menu text required even if "Add to menu" checkbox is unchecked Title is required

Browse Source 
--HG--
branch : dev
This commit is contained in:
Suha Can
2010-03-01 15:42:47 -08:00
parent 2ed5a1c3e8
commit 0cb9f7e2da
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs
View File

@@ -1,7 +1,9 @@
using JetBrains.Annotations; using System;
using JetBrains.Annotations;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.ContentManagement.Drivers; using Orchard.ContentManagement.Drivers;
using Orchard.Core.Navigation.Models; using Orchard.Core.Navigation.Models;
using Orchard.Localization;
using Orchard.Security; using Orchard.Security;
using Orchard.UI.Navigation; using Orchard.UI.Navigation;
using Orchard.Utility; using Orchard.Utility;
@@ -15,9 +17,11 @@ namespace Orchard.Core.Navigation.Drivers {
public MenuPartDriver(IAuthorizationService authorizationService, INavigationManager navigationManager) { public MenuPartDriver(IAuthorizationService authorizationService, INavigationManager navigationManager) {
_authorizationService = authorizationService; _authorizationService = authorizationService;
_navigationManager = navigationManager; _navigationManager = navigationManager;
T = NullLocalizer.Instance;
} }
public virtual IUser CurrentUser { get; set; } public virtual IUser CurrentUser { get; set; }
private Localizer T { get; set; }
protected override DriverResult Editor(MenuPart part) { protected override DriverResult Editor(MenuPart part) {
if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, CurrentUser, part)) if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, CurrentUser, part))
@@ -34,6 +38,9 @@ namespace Orchard.Core.Navigation.Drivers {
part.MenuPosition = Position.GetNext(_navigationManager.BuildMenu("main")); part.MenuPosition = Position.GetNext(_navigationManager.BuildMenu("main"));
updater.TryUpdateModel(part, Prefix, null, null); 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"); return ContentPartTemplate(part, "Parts/Navigation.EditMenuPart").Location("primary", "9");
} }
} }

1
src/Orchard.Web/Core/Navigation/Models/MenuPart.cs
View File

@@ -13,7 +13,6 @@ namespace Orchard.Core.Navigation.Models {
set { Record.OnMainMenu = value; } set { Record.OnMainMenu = value; }
} }
[Required]
public string MenuText { public string MenuText {
get { return Record.MenuText; } get { return Record.MenuText; }
set { Record.MenuText = value; } set { Record.MenuText = value; }