starred/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-23 23:20:51 +01:00
Code Issues 725 Projects Packages Wiki Activity Actions 2

Backport pull request #15380 from jellyfin/release-10.11.z

Browse source 
Fix item count display for collapsed items

Original-merge: 8f71922734

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Bond_009 <bond.009@outlook.com>
This commit is contained in:
theguymadmax 2025-11-17 14:08:50 -05:00 • committed by Bond_009
parent c805c5e2b1
commit 7d05c875f3
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
MediaBrowser.Controller/Entities/Folder.cs
View file

@ -729,9 +729,7 @@ namespace MediaBrowser.Controller.Entities
query.StartIndex = startIndex;
}
var result = PostFilterAndSort(items, query);
result.TotalRecordCount = totalCount;
return result;
return PostFilterAndSort(items, query);
}
if (this is not UserRootFolder
@ -1001,9 +999,7 @@ namespace MediaBrowser.Controller.Entities
items = GetChildren(user, true, out totalItemCount, childQuery).Where(filter);
}
var result = PostFilterAndSort(items, query);
result.TotalRecordCount = totalItemCount;
return result;
return PostFilterAndSort(items, query);
}
protected QueryResult<BaseItem> PostFilterAndSort(IEnumerable<BaseItem> items, InternalItemsQuery query)
@ -1039,7 +1035,15 @@ namespace MediaBrowser.Controller.Entities
items = UserViewBuilder.FilterForAdjacency(items.ToList(), query.AdjacentTo.Value);
}
return UserViewBuilder.SortAndPage(items, null, query, LibraryManager);
var filteredItems = items as IReadOnlyList<BaseItem> ?? items.ToList();
var result = UserViewBuilder.SortAndPage(filteredItems, null, query, LibraryManager);
if (query.EnableTotalRecordCount)
{
result.TotalRecordCount = filteredItems.Count;
}
return result;
}
private static IEnumerable<BaseItem> CollapseBoxSetItemsIfNeeded(