Skip to content

Commit 8ce2216

Browse files
authored
Добавить незанятых персонажей в список проблемных (#3046)
1 parent 9fe04d0 commit 8ce2216

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/JoinRpg.Portal/Controllers/CharacterListController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public Task<ActionResult> Deleted(int projectId, string export)
3838
[HttpGet]
3939
public Task<ActionResult> Problems(int projectid, string export)
4040
=> MasterCharacterList(projectid,
41-
(character, projectInfo) => character.ApprovedClaimId != null && problemValidator.Validate(character, projectInfo).Any(), export,
41+
(character, projectInfo) => problemValidator.Validate(character, projectInfo).Any(), export,
4242
"Проблемные персонажи");
4343

4444
[HttpGet]

src/JoinRpg.WebPortal.Models/Characters/CharacterListItemViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public class CharacterListViewModel(
4141
new CharacterListItemViewModel(character,
4242
currentUserId,
4343
projectInfo, problemValidator)).ToArray();
44-
public int? ProjectId { get; } = project.ProjectId;
44+
public int? ProjectId { get; } = projectInfo.ProjectId.Value;
4545
public IReadOnlyCollection<int> ClaimIds { get; } = characters.Select(c => c.ApprovedClaim?.ClaimId).WhereNotNull().ToArray();
4646
public IReadOnlyCollection<int> CharacterIds { get; } = characters.Select(c => c.CharacterId).ToArray();
47-
public string ProjectName { get; } = project.ProjectName;
47+
public string ProjectName { get; } = projectInfo.ProjectName;
4848
public string Title { get; } = title;
4949

5050
public bool HasEditAccess { get; } = project.HasEditRolesAccess(currentUserId);

0 commit comments

Comments
 (0)