Firehawk52-backup/jellyfin
28
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 08:23:28 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix collection display order (#15767)

Browse Source
This commit is contained in:
theguymadmax
2025-12-13 10:27:01 -05:00
committed by GitHub
parent 5804d6840c
commit 22da5187c8
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -1406,13 +1406,6 @@ namespace MediaBrowser.Controller.Entities
.Where(e => query is null || UserViewBuilder.FilterItem(e, query)) .Where(e => query is null || UserViewBuilder.FilterItem(e, query))
.ToArray(); .ToArray();
if (this is BoxSet && (query.OrderBy is null || query.OrderBy.Count == 0))
{
realChildren = realChildren
.OrderBy(e => e.PremiereDate ?? DateTime.MaxValue)
.ToArray();
}
var childCount = realChildren.Length; var childCount = realChildren.Length;
if (result.Count < limit) if (result.Count < limit)
{ {

8
MediaBrowser.Controller/Entities/Movies/BoxSet.cs
View File

@@ -124,7 +124,7 @@ namespace MediaBrowser.Controller.Entities.Movies
if (sortBy == ItemSortBy.Default) if (sortBy == ItemSortBy.Default)
{ {
return items; return items;
} }
return LibraryManager.Sort(items, user, new[] { sortBy }, SortOrder.Ascending); return LibraryManager.Sort(items, user, new[] { sortBy }, SortOrder.Ascending);
@@ -136,6 +136,12 @@ namespace MediaBrowser.Controller.Entities.Movies
return Sort(children, user).ToArray(); return Sort(children, user).ToArray();
} }
public override IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, out int totalItemCount, InternalItemsQuery query = null)
{
var children = base.GetChildren(user, includeLinkedChildren, out totalItemCount, query);
return Sort(children, user).ToArray();
}
public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query, out int totalCount) public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query, out int totalCount)
{ {
var children = base.GetRecursiveChildren(user, query, out totalCount); var children = base.GetRecursiveChildren(user, query, out totalCount);