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

Gets sln building and manually merges the entity/media service changes

Browse Source
This commit is contained in:
Shannon
2018-11-19 17:54:36 +11:00
parent c3736ce7ab
commit 99d9c49c9f
15 changed files with 80 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
View File

@@ -197,9 +197,8 @@ namespace Umbraco.Web.Trees
entityId = entity.Id;
}
return GetChildrenFromEntityService(entityId);
IEntitySlim[] result;
/*
// if a request is made for the root node but user has no access to
// root node, return start nodes instead
if (entityId == Constants.System.Root && UserStartNodes.Contains(Constants.System.Root) == false)
@@ -210,10 +209,10 @@ namespace Umbraco.Web.Trees
}
else
{
result = Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToArray();
result = GetChildrenFromEntityService(entityId).ToArray();
}
return result;*/
return result;
}
/// <summary>
@@ -221,7 +220,7 @@ namespace Umbraco.Web.Trees
/// </summary>
/// <param name="entityId"></param>
/// <returns></returns>
internal abstract IEnumerable<IUmbracoEntity> GetChildrenFromEntityService(int entityId);
internal abstract IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId);
/// <summary>
/// Returns true or false if the current user has access to the node based on the user's allowed start node (path) access