fix merge

This commit is contained in:
Shannon
2019-07-03 11:10:34 +10:00
parent 33aff7ff61
commit d3b4b9fe64

View File

@@ -621,25 +621,6 @@ namespace Umbraco.Web.Editors
}
}
private int[] GetStartNodes(UmbracoEntityTypes type)
{
int[] startNodes = null;
switch (type)
{
case UmbracoEntityTypes.Document:
startNodes = Security.CurrentUser.CalculateContentStartNodeIds(Services.EntityService);
break;
case UmbracoEntityTypes.Media:
startNodes = Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
break;
default:
startNodes = Array.Empty<int>();
break;
}
return startNodes;
}
private int[] GetStartNodes(UmbracoEntityTypes type)
{
switch (type)
@@ -649,12 +630,10 @@ namespace Umbraco.Web.Editors
case UmbracoEntityTypes.Media:
return Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
default:
return new int[0];
return Array.Empty<int>();
}
}
public PagedResult<EntityBasic> GetPagedDescendants(
int id,
UmbracoEntityTypes type,