Move edit button in PermissionsEui (#45420)

Move edit button to first column in PermissionsEui admin list

Compute combined flags earlier so we can create the edit button before other columns.
This commit is contained in:
NotSoDamn 2026-09-25 15:21:45 +00:00 • committed by GitHub
parent 2d2b12de2b
commit 7e6d2b28d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -211,16 +211,7 @@ namespace Content.Client.Administration.UI
var al = _menu.AdminsList;
var name = admin.UserName ?? admin.UserId.ToString();
al.AddChild(new Label { Text = name });
var titleControl = new Label { Text = admin.Title ?? Loc.GetString("permissions-eui-edit-admin-title-control-text").ToLowerInvariant() };
if (admin.Title == null) // none
{
titleControl.StyleClasses.Add(StyleClass.Italic);
}
al.AddChild(titleControl);
// Compute rank and combined flags first so we can create the edit button before other columns.
bool italic;
string rank;
var combinedFlags = admin.PosFlags;
@ -237,6 +228,25 @@ namespace Content.Client.Administration.UI
rank = Loc.GetString("permissions-eui-edit-no-rank-text").ToLowerInvariant();
}
var editButton = new Button { Text = Loc.GetString("permissions-eui-edit-title-button") };
editButton.OnPressed += _ => OnEditPressed(admin);
// Add the edit button as the first column
al.AddChild(editButton);
// Name (C-key)
al.AddChild(new Label { Text = name });
// Prefix / Title
var titleControl = new Label { Text = admin.Title ?? Loc.GetString("permissions-eui-edit-admin-title-control-text").ToLowerInvariant() };
if (admin.Title == null) // none
{
titleControl.StyleClasses.Add(StyleClass.Italic);
}
al.AddChild(titleControl);
// Rank
var rankControl = new Label { Text = rank };
if (italic)
{
@ -245,6 +255,7 @@ namespace Content.Client.Administration.UI
al.AddChild(rankControl);
// Flags / Additional rights
var flagsText = AdminFlagsHelper.PosNegFlagsText(admin.PosFlags, admin.NegFlags);
al.AddChild(new Label
@ -254,10 +265,6 @@ namespace Content.Client.Administration.UI
HorizontalAlignment = Control.HAlignment.Center,
});
var editButton = new Button { Text = Loc.GetString("permissions-eui-edit-title-button") };
editButton.OnPressed += _ => OnEditPressed(admin);
al.AddChild(editButton);
if (!_adminManager.HasFlag(combinedFlags))
{
editButton.Disabled = true;