A little work on new menu item (in main menu management) validation

--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-02-15 16:49:09 -08:00
parent 617753c518
commit a8eb9f6328
4 changed files with 23 additions and 14 deletions

View File

@@ -23,13 +23,17 @@ namespace Orchard.Core.Navigation.Controllers {
private Localizer T { get; set; }
public ActionResult Index() {
public ActionResult Index(NavigationManagementViewModel model) {
if (!_services.Authorizer.Authorize(Permissions.ManageMainMenu, T("Not allowed to manage the main menu")))
return new HttpUnauthorizedResult();
var model = new NavigationManagementViewModel { Menu = _navigationManager.BuildMenu("main") };
if (model == null)
model = new NavigationManagementViewModel();
return View(model);
if (model.Menu == null || model.Menu.Count() < 1)
model.Menu = _navigationManager.BuildMenu("main");
return View("Index", model);
}
[HttpPost, ActionName("Index")]
@@ -50,7 +54,7 @@ namespace Orchard.Core.Navigation.Controllers {
if (!ModelState.IsValid) {
_services.TransactionManager.Cancel();
return Index();
return Index(new NavigationManagementViewModel {NewMenuItem = model});
}
if (string.IsNullOrEmpty(menuItem.As<MenuPart>().MenuPosition))