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

init commit of removing code for entity service that loads in any property data

Browse Source
This commit is contained in:
Shannon
2019-06-13 18:45:33 +10:00
parent 7f5f304d2d
commit 16f6bbcbd4
9 changed files with 171 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/Trees/ContentTreeController.cs
View File

@@ -201,8 +201,8 @@ namespace Umbraco.Web.Trees
return HasPathAccess(entity, queryStrings);
}
internal override IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
=> Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToList();
//internal override IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
// => Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToList();
protected override IEnumerable<IEntitySlim> GetChildEntities(string id, FormDataCollection queryStrings)
{
@@ -327,7 +327,7 @@ namespace Umbraco.Web.Trees
public IEnumerable<SearchResultEntity> Search(string query, int pageSize, long pageIndex, out long totalFound, string searchFrom = null)
{
return _treeSearcher.ExamineSearch(query, UmbracoEntityTypes.Document, pageSize, pageIndex, out totalFound, searchFrom);
return _treeSearcher.ExamineSearch(query, UmbracoEntityTypes.Document, pageSize, pageIndex, out totalFound, false, searchFrom);
}
}
}

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

@@ -214,12 +214,8 @@ namespace Umbraco.Web.Trees
return result;
}
/// <summary>
/// Abstract method to fetch the entities from the entity service
/// </summary>
/// <param name="entityId"></param>
/// <returns></returns>
internal abstract IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId);
internal virtual IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
=> Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToList();
/// <summary>
/// Returns true or false if the current user has access to the node based on the user's allowed start node (path) access

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

@@ -164,14 +164,17 @@ namespace Umbraco.Web.Trees
public IEnumerable<SearchResultEntity> Search(string query, int pageSize, long pageIndex, out long totalFound, string searchFrom = null)
{
return _treeSearcher.ExamineSearch(query, UmbracoEntityTypes.Media, pageSize, pageIndex, out totalFound, searchFrom);
return _treeSearcher.ExamineSearch(query, UmbracoEntityTypes.Media, pageSize, pageIndex, out totalFound, false, searchFrom);
}
internal override IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
// Not pretty having to cast the service, but it is the only way to get to use an internal method that we
// do not want to make public on the interface. Unfortunately also prevents this from being unit tested.
// See this issue for details on why we need this:
// https://github.com/umbraco/Umbraco-CMS/issues/3457
=> ((EntityService)Services.EntityService).GetMediaChildrenWithoutPropertyData(entityId).ToList();
//internal override IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
// => Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToList();
//internal override IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
// // Not pretty having to cast the service, but it is the only way to get to use an internal method that we
// // do not want to make public on the interface. Unfortunately also prevents this from being unit tested.
// // See this issue for details on why we need this:
// // https://github.com/umbraco/Umbraco-CMS/issues/3457
// => ((EntityService)Services.EntityService).GetMediaChildrenWithoutPropertyData(entityId).ToList();
}
}