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

U4-10173 - fix

Browse Source
This commit is contained in:
Stephan
2017-07-18 15:54:22 +02:00
parent 8c3f6dfc25
commit f28136de91
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,14 +185,14 @@ namespace Umbraco.Core.Models
{
var gsn = user.Groups.Where(x => x.StartContentId.HasValue).Select(x => x.StartContentId.Value).Distinct().ToArray();
var usn = user.StartContentIds;
return CombineStartNodes(gsn, usn, entityService);
return CombineStartNodes(UmbracoObjectTypes.Document, gsn, usn, entityService);
}
public static int[] GetAllMediaStartNodes(this IUser user, IEntityService entityService)
{
var gsn = user.Groups.Where(x => x.StartMediaId.HasValue).Select(x => x.StartMediaId.Value).Distinct().ToArray();
var usn = user.StartMediaIds;
return CombineStartNodes(gsn, usn, entityService);
return CombineStartNodes(UmbracoObjectTypes.Media, gsn, usn, entityService);
}
private static bool StartsWithPath(string test, string path)
@@ -200,12 +200,12 @@ namespace Umbraco.Core.Models
return test.StartsWith(path) && test.Length > path.Length && test[path.Length] == ',';
}
private static int[] CombineStartNodes(int[] groupSn, int[] userSn, IEntityService entityService)
private static int[] CombineStartNodes(UmbracoObjectTypes objectType, int[] groupSn, int[] userSn, IEntityService entityService)
{
// assume groupSn and userSn each don't contain duplicates
var asn = groupSn.Concat(userSn).Distinct().ToArray();
var paths = entityService.GetAll(UmbracoObjectTypes.Document, asn).ToDictionary(x => x.Id, x => x.Path);
var paths = entityService.GetAll(objectType, asn).ToDictionary(x => x.Id, x => x.Path);
paths[-1] = "-1"; // entityService does not get that one