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

Updated DB and business logic to support multiple starts nodes for a user and for user groups to have start nodes - U4-9915 User Groups will have a start node assigned and Users can have multiple start nodes assigned

Browse Source
This commit is contained in:
Shannon
2017-05-25 02:03:41 +10:00
parent 38837049f0
commit dec9422531
70 changed files with 774 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Core/Models/UserExtensions.cs
View File

@@ -49,24 +49,34 @@ namespace Umbraco.Core.Models
{
if (user == null) throw new ArgumentNullException("user");
if (content == null) throw new ArgumentNullException("content");
return HasPathAccess(content.Path, user.StartContentId, Constants.System.RecycleBinContent);
return HasPathAccess(content.Path, user.StartContentIds, Constants.System.RecycleBinContent);
}
internal static bool HasPathAccess(string path, int startNodeId, int recycleBinId)
internal static bool HasPathAccess(string path, int[] startNodeIds, int recycleBinId)
{
Mandate.ParameterNotNullOrEmpty(path, "path");
var formattedPath = "," + path + ",";
var formattedStartNodeId = "," + startNodeId.ToInvariantString() + ",";
var formattedRecycleBinId = "," + recycleBinId.ToInvariantString() + ",";
//only users with root access have access to the recycle bin
if (formattedPath.Contains(formattedRecycleBinId))
{
return startNodeId == Constants.System.Root;
var hasAccess = startNodeIds.Length == 0 || startNodeIds.Contains(Constants.System.Root);
return hasAccess;
}
//check for normal paths
foreach (var startNodeId in startNodeIds)
{
var formattedStartNodeId = "," + startNodeId.ToInvariantString() + ",";
var hasAccess = formattedPath.Contains(formattedStartNodeId);
if (hasAccess)
return true;
}
return formattedPath.Contains(formattedStartNodeId);
return false;
}
/// <summary>
@@ -79,7 +89,7 @@ namespace Umbraco.Core.Models
{
if (user == null) throw new ArgumentNullException("user");
if (media == null) throw new ArgumentNullException("media");
return HasPathAccess(media.Path, user.StartMediaId, Constants.System.RecycleBinMedia);
return HasPathAccess(media.Path, user.StartMediaIds, Constants.System.RecycleBinMedia);
}
/// <summary>