tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "Next" never sending admin logs for rounds outside the cache, show a round's total logs on the UI (#16531)

Browse Source 
* Fix next never sending logs for rounds outside the cache

* Show round's total log count on the ui

* Disable next button when waiting for a next response

* Cleanup AdminLogsEui.CurrentRoundId

* Fix popout window width
This commit is contained in:
DrSmugleaf
2023-05-17 04:04:28 -07:00
committed by GitHub
parent 9ef5bd389c
commit b5fe408baf
10 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
View File

@@ -54,6 +54,7 @@ public sealed partial class AdminLogsControl : Control
public string Search => LogSearch.Text;
private int ShownLogs { get; set; }
private int TotalLogs { get; set; }
private int RoundLogs { get; set; }
public bool IncludeNonPlayerLogs { get; set; }
public HashSet<LogType> SelectedTypes { get; } = new();
@@ -485,7 +486,7 @@ public sealed partial class AdminLogsControl : Control
AddLogs(logs);
}
private void UpdateCount(int? shown = null, int? total = null)
public void UpdateCount(int? shown = null, int? total = null, int? round = null)
{
if (shown != null)
{
@@ -497,7 +498,15 @@ public sealed partial class AdminLogsControl : Control
TotalLogs = total.Value;
}
Count.Text = Loc.GetString("admin-logs-count", ("showing", ShownLogs), ("total", TotalLogs));
if (round != null)
{
RoundLogs = round.Value;
}
Count.Text = Loc.GetString(
"admin-logs-count",
("showing", ShownLogs), ("total", TotalLogs), ("round", RoundLogs)
);
}
protected override void Dispose(bool disposing)