yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating a bunch of start node checking logic to ensure that it takes the user and user group start nodes into account

Browse Source
This commit is contained in:
Shannon
2017-06-20 18:38:31 +10:00
parent cec829774e
commit 9dc34f0c98
6 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/Trees/MediaTreeController.cs
View File

@@ -35,7 +35,7 @@ namespace Umbraco.Web.Trees
{
var node = base.CreateRootNode(queryStrings);
//if the user's start node is not default, then ensure the root doesn't have a menu
if (Security.CurrentUser.StartMediaIds.Length > 0 && Security.CurrentUser.StartMediaIds.Contains(Constants.System.Root) == false)
if (UserStartNodes.Length > 0 && UserStartNodes.Contains(Constants.System.Root) == false)
{
node.MenuUrl = "";
}
@@ -53,9 +53,10 @@ namespace Umbraco.Web.Trees
get { return Services.MediaService.RecycleBinSmells(); }
}
private int[] _userStartNodes;
protected override int[] UserStartNodes
{
get { return Security.CurrentUser.StartMediaIds; }
get { return _userStartNodes ?? (_userStartNodes = Security.CurrentUser.GetCombinedStartMediaIds().ToArray()); }
}
/// <summary>
@@ -100,7 +101,7 @@ namespace Umbraco.Web.Trees
if (id == Constants.System.Root.ToInvariantString())
{
//if the user's start node is not the root then ensure the root menu is empty/doesn't exist
if (Security.CurrentUser.StartMediaIds.Length > 0 && Security.CurrentUser.StartMediaIds.Contains(Constants.System.Root) == false)
if (UserStartNodes.Length > 0 && UserStartNodes.Contains(Constants.System.Root) == false)
{
return menu;
}