alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 23:58:57 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixed Multi Sort in New ActivityManager (#15820)
Some checks failed
Stale PR Check / Check PRs with merge conflicts (push) Has been cancelled
Details
Project Automation / Project board (push) Has been cancelled
Details
Merge Conflict Labeler / Labeling (push) Has been cancelled
Details
CodeQL / Analyze (csharp) (push) Has been cancelled
Details
OpenAPI / OpenAPI - HEAD (push) Has been cancelled
Details
OpenAPI / OpenAPI - BASE (push) Has been cancelled
Details
Tests / run-tests (macos-latest) (push) Has been cancelled
Details
Tests / run-tests (ubuntu-latest) (push) Has been cancelled
Details
Tests / run-tests (windows-latest) (push) Has been cancelled
Details
OpenAPI / OpenAPI - Difference (push) Has been cancelled
Details
OpenAPI / OpenAPI - Publish Unstable Spec (push) Has been cancelled
Details
OpenAPI / OpenAPI - Publish Stable Spec (push) Has been cancelled
Details
Stale Issue Labeler / Check for stale issues (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Björn Tenje Persson
2025-12-20 04:36:38 +01:00
committed by GitHub
parent d446fde009
commit 84f66dd54e
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Jellyfin.Server.Implementations/Activity/ActivityManager.cs
View File

@@ -72,6 +72,11 @@ public class ActivityManager : IActivityManager
entries = entries.Where(e => e.ActivityLog.DateCreated >= query.MinDate.Value);
}
if (query.MaxDate is not null)
{
entries = entries.Where(e => e.ActivityLog.DateCreated <= query.MaxDate.Value);
}
if (!string.IsNullOrEmpty(query.Name))
{
entries = entries.Where(e => EF.Functions.Like(e.ActivityLog.Name, $"%{query.Name}%"));
@@ -166,9 +171,19 @@ public class ActivityManager : IActivityManager
foreach (var (sortBy, sortOrder) in sorting)
{
var orderBy = MapOrderBy(sortBy);
ordered = sortOrder == SortOrder.Ascending
? (ordered ?? query).OrderBy(orderBy)
: (ordered ?? query).OrderByDescending(orderBy);
if (ordered == null)
{
ordered = sortOrder == SortOrder.Ascending
? query.OrderBy(orderBy)
: query.OrderByDescending(orderBy);
}
else
{
ordered = sortOrder == SortOrder.Ascending
? ordered.ThenBy(orderBy)
: ordered.ThenByDescending(orderBy);
}
}
return ordered;