Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[feat] Разделение банов по серверам.

Browse Source 
# Conflicts:
#	Content.Client/Administration/UI/BanList/BanListLine.xaml.cs
#	Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml
#	Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml
#	Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
#	Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
#	Content.IntegrationTests/Tests/Commands/PardonCommand.cs
#	Content.Server/Administration/Commands/BanCommand.cs
#	Content.Server/Administration/Commands/DepartmentBanCommand.cs
#	Content.Server/Administration/Commands/RoleBanCommand.cs
#	Content.Server/Administration/Managers/RoleBanManager.cs
#	Content.Server/Database/ServerDbManager.cs
#	Content.Server/Database/ServerDbPostgres.cs
#	Content.Server/Database/ServerDbSqlite.cs
This commit is contained in:
rhailrake
2023-04-30 14:27:27 +06:00
committed by Remuchi
parent 8bd6754472
commit 977e075086
42 changed files with 5825 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Administration/UI/BanList/BanListEui.cs
View File

@@ -92,6 +92,7 @@ public sealed class BanListEui : BaseEui
}
line.BanningAdmin.Text = ban.BanningAdminName;
line.ServerName.Text = ban.ServerName == "unknown" ? "GLOBAL" : ban.ServerName;
}
private void OnLineIdsClicked<T>(IBanListLine<T> line) where T : SharedServerBan

5
Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml
View File

@@ -25,6 +25,11 @@
<Label Text="{Loc ban-list-header-banning-admin}"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"/>
<cc:VSeparator/>
<Label Text="{Loc ban-list-header-server}"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"/>
<cc:VSeparator/>
</BoxContainer>
</PanelContainer>
</ContainerButton>

7
Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml
View File

@@ -38,4 +38,11 @@
SizeFlagsStretchRatio="2"
HorizontalExpand="True"
ClipText="True"/>
<cc:VSeparator/>
<Label Name="ServerName"
Access="Public"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"
ClipText="True"/>
<cc:VSeparator/>
</BoxContainer>

1
Content.Client/Administration/UI/BanList/IBanListLine.cs
View File

@@ -10,4 +10,5 @@ public interface IBanListLine<T> where T : SharedServerBan
Label BanTime { get; }
Label Expires { get; }
Label BanningAdmin { get; }
Label ServerName { get; }
}

5
Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml
View File

@@ -29,6 +29,11 @@
<Label Text="{Loc ban-list-header-banning-admin}"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"/>
<cc:VSeparator/>
<Label Text="{Loc ban-list-header-server}"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"/>
<cc:VSeparator/>
</BoxContainer>
</PanelContainer>
</ContainerButton>

7
Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml
View File

@@ -43,4 +43,11 @@
SizeFlagsStretchRatio="2"
HorizontalExpand="True"
ClipText="True"/>
<cc:VSeparator/>
<Label Name="ServerName"
Access="Public"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"
ClipText="True"/>
<cc:VSeparator/>
</BoxContainer>