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

Admin notes bugfixes (#18189)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2023-07-21 15:43:47 +02:00
committed by GitHub
parent 703f3d8bc6
commit b4b0fe41db
10 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.Administration.Notes;
using Content.Shared.Administration.Notes;
using Content.Shared.Database;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
@@ -18,6 +18,7 @@ public sealed partial class AdminNotesLinePopup : Popup
public AdminNotesLinePopup(SharedAdminNote note, string playerName, bool showDelete, bool showEdit)
{
IoCManager.InjectDependencies(this);
RobustXamlLoader.Load(this);
NoteId = note.Id;

4
Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
View File

@@ -163,7 +163,7 @@ public sealed partial class NoteEdit : FancyWindow
return;
if (DeleteResetOn is null)
{
DeleteResetOn = _gameTiming.CurTime.Add(TimeSpan.FromSeconds(3));
DeleteResetOn = _gameTiming.RealTime + TimeSpan.FromSeconds(3);
SubmitButton.Text = Loc.GetString("admin-note-editor-submit-confirm");
SubmitButton.ModulateSelfOverride = Color.Red;
// Task.Delay(3000).ContinueWith(_ => ResetSubmitButton()); // TODO: fix
@@ -185,7 +185,7 @@ public sealed partial class NoteEdit : FancyWindow
{
base.FrameUpdate(args);
// This checks for null for free, do not invert it as null always produces a false value
if (DeleteResetOn > _gameTiming.CurTime)
if (DeleteResetOn < _gameTiming.RealTime)
{
ResetSubmitButton();
DeleteResetOn = null;