lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixing User menu item when it has not children

Browse Source
This commit is contained in:
Sebastien Ros
2014-03-19 18:13:16 -07:00
parent 136fbf153a
commit a05a3d8dab
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Orchard.Web/Core/Navigation/Services/NavigationManager.cs
View File

@@ -121,9 +121,20 @@ namespace Orchard.Core.Navigation.Services {
item.Permissions.Any(x => _authorizationService.TryCheckAccess(
x,
_orchardServices.WorkContext.CurrentUser,
item.Content == null || isAdminMenu ? null : item.Content))))
{
item.Items = Reduce(item.Items, isAdminMenu, hasDebugShowAllMenuItems);
item.Content == null || isAdminMenu ? null : item.Content)))) {
var oldItems = item.Items;
item.Items = Reduce(item.Items, isAdminMenu, hasDebugShowAllMenuItems).ToList();
// if all sub items have been filtered out, ensure the main one is not one of them
// e.g., Manage Roles and Manage Users are not granted, the Users item should not show up
if (oldItems.Any() && !item.Items.Any()) {
if (oldItems.Any(x => NavigationHelper.RouteMatches(x.RouteValues, item.RouteValues))) {
continue;
}
}
// if there are sub items returns the current item, otherwise ensure this item has valid permissions
yield return item;
}
}

2
src/Orchard.Web/Modules/Orchard.Roles/AdminMenu.cs
View File

@@ -10,7 +10,7 @@ namespace Orchard.Roles {
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Users"),
menu => menu.Add(T("Roles"), "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Roles" })
.LocalNav().Permission(StandardPermissions.SiteOwner)));
.LocalNav().Permission(Permissions.ManageRoles)));
}
}
}