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

Fixes divide by zero error on retrieving take 0 from the recycle bin root API endpoint (#20096)

Browse Source 
Fixes divide by zero error on retrieving take 0 from the recycle bin root API endpoint.
This commit is contained in:
Andy Butland
2025-09-09 14:48:00 +02:00
committed by GitHub
parent d51561b202
commit 00092b5061
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Core/Services/EntityService.cs
View File

@@ -440,7 +440,7 @@ public class EntityService : RepositoryService, IEntityService
if (take == 0)
{
totalRecords = CountChildren(parentId, childObjectType, filter);
totalRecords = CountChildren(parentId, childObjectType, filter: filter);
return Enumerable.Empty<IEntitySlim>();
}
@@ -487,6 +487,12 @@ public class EntityService : RepositoryService, IEntityService
return Enumerable.Empty<IEntitySlim>();
}
if (take == 0)
{
totalRecords = CountChildren(parentId, objectType, true, filter);
return Enumerable.Empty<IEntitySlim>();
}
PaginationHelper.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize);
IEnumerable<IEntitySlim> children = GetPagedChildren(
@@ -693,17 +699,18 @@ public class EntityService : RepositoryService, IEntityService
}
}
private int CountChildren(int id, UmbracoObjectTypes objectType, IQuery<IUmbracoEntity>? filter = null) =>
CountChildren(id, new HashSet<UmbracoObjectTypes>() { objectType }, filter);
private int CountChildren(int id, UmbracoObjectTypes objectType, bool trashed = false, IQuery<IUmbracoEntity>? filter = null) =>
CountChildren(id, new HashSet<UmbracoObjectTypes>() { objectType }, trashed, filter);
private int CountChildren(
int id,
IEnumerable<UmbracoObjectTypes> objectTypes,
bool trashed = false,
IQuery<IUmbracoEntity>? filter = null)
{
using (ScopeProvider.CreateCoreScope(autoComplete: true))
{
IQuery<IUmbracoEntity> query = Query<IUmbracoEntity>().Where(x => x.ParentId == id && x.Trashed == false);
IQuery<IUmbracoEntity> query = Query<IUmbracoEntity>().Where(x => x.ParentId == id && x.Trashed == trashed);
var objectTypeGuids = objectTypes.Select(x => x.GetGuid()).ToHashSet();
return _entityRepository.CountByQuery(query, objectTypeGuids, filter);
@@ -782,7 +789,7 @@ public class EntityService : RepositoryService, IEntityService
if (take == 0)
{
totalRecords = CountChildren(parentId, childObjectTypes, filter);
totalRecords = CountChildren(parentId, childObjectTypes, filter: filter);
return Array.Empty<IEntitySlim>();
}