Fix Next button resending the same admin logs (#16557)

diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
index 41eafe7978c9e87291a0e879c021cbfe0aca5719..be1bddcd3707bb2e3584b0a47144510834165f2b 100644 (file)
--- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
@@ -62,7 +62,6 @@ public sealed class AdminLogsEui : BaseEui
             LogsControl.SelectedPlayers.ToArray(),
             null,
             LogsControl.IncludeNonPlayerLogs,
-            null,
             DateOrder.Descending);
 
         SendMessage(request);

diff --git a/Content.Server/Administration/Logs/AdminLogsEui.cs b/Content.Server/Administration/Logs/AdminLogsEui.cs
index fe032d33cc00df17a593ed47b7e64a227a9654c4..8bd870b2c77b524031f1f1e91f57f28c8fac9a60 100644 (file)
--- a/Content.Server/Administration/Logs/AdminLogsEui.cs
+++ b/Content.Server/Administration/Logs/AdminLogsEui.cs
@@ -165,8 +165,8 @@ public sealed class AdminLogsEui : BaseEui
 
             var largestId = _filter.DateOrder switch
             {
-                DateOrder.Ascending => ^1,
-                DateOrder.Descending => 0,
+                DateOrder.Ascending => 0,
+                DateOrder.Descending => ^1,
                 _ => throw new ArgumentOutOfRangeException(nameof(_filter.DateOrder), _filter.DateOrder, null)
             };
 

diff --git a/Content.Shared/Administration/Logs/AdminLogsEuiState.cs b/Content.Shared/Administration/Logs/AdminLogsEuiState.cs
index fa94fd0b45ea467b6007d92c215862f64a6a8a5d..68b56ae9dde519ca86333d5b2427f2c6fc1fdc90 100644 (file)
--- a/Content.Shared/Administration/Logs/AdminLogsEuiState.cs
+++ b/Content.Shared/Administration/Logs/AdminLogsEuiState.cs
@@ -69,7 +69,6 @@ public static class AdminLogsEuiMsg
             Guid[]? anyPlayers,
             Guid[]? allPlayers,
             bool includeNonPlayers,
-            int? lastLogId,
             DateOrder dateOrder)
         {
             RoundId = roundId;
@@ -82,7 +81,6 @@ public static class AdminLogsEuiMsg
             AnyPlayers = anyPlayers is { Length: > 0 } ? anyPlayers : null;
             AllPlayers = allPlayers is { Length: > 0 } ? allPlayers : null;
             IncludeNonPlayers = includeNonPlayers;
-            LastLogId = lastLogId;
             DateOrder = dateOrder;
         }
 
@@ -96,7 +94,6 @@ public static class AdminLogsEuiMsg
         public Guid[]? AnyPlayers { get; set; }
         public Guid[]? AllPlayers { get; set; }
         public bool IncludeNonPlayers { get; set; }
-        public int? LastLogId { get; set; }
         public DateOrder DateOrder { get; set; }
     }