mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-09-22 20:13:50 +08:00
- Fixing 16236: Menu text required even if "Add to menu" checkbox is unchecked Title is required
--HG-- branch : dev
This commit is contained in:
@@ -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");
|
||||
}
|
||||
}
|
||||
|
@@ -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; }
|
||||
|
Reference in New Issue
Block a user