Skip to content

Commit 2301709

Browse files
authored
Только активные персонажи должны показываться в выпадайке про слоты (#2844)
1 parent fb48a01 commit 2301709

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/JoinRpg.Dal.Impl/Repositories/CharacterRepositoryImpl.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,11 @@ public async Task<IEnumerable<Character>> GetAllCharacters(int projectId)
127127
.ToListAsync();
128128
}
129129

130-
public async Task<IEnumerable<Character>> GetTemplateCharacters(int projectId)
130+
public async Task<IEnumerable<Character>> GetActiveTemplateCharacters(int projectId)
131131
{
132132
return await Ctx.Set<Character>()
133133
.Where(c => c.ProjectId == projectId)
134+
.Where(c => c.IsActive)
134135
.Where(c => c.CharacterType == PrimitiveTypes.CharacterType.Slot)
135136
.OrderBy(c => c.CharacterName)
136137
.ToListAsync();

src/JoinRpg.Data.Interfaces/ICharacterRepository.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface ICharacterRepository : IDisposable
2020
Task<CharacterView> GetCharacterViewAsync(int projectId, int characterId);
2121
Task<IEnumerable<Character>> GetAvailableCharacters(int projectId);
2222
Task<IEnumerable<Character>> GetAllCharacters(int projectId);
23-
Task<IEnumerable<Character>> GetTemplateCharacters(int projectId);
23+
Task<IEnumerable<Character>> GetActiveTemplateCharacters(int projectId);
2424
}
2525

2626
public class CharacterView : IFieldContainter

src/JoinRpg.WebPortal.Managers/CharacterGroupList/CharacterListViewService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public async Task<List<CharacterDto>> GetCharacters(int projectId)
1717

1818
public async Task<List<CharacterDto>> GetTemplateCharacters(int projectId)
1919
{
20-
var characters = await characterRepository.GetTemplateCharacters(projectId);
20+
var characters = await characterRepository.GetActiveTemplateCharacters(projectId);
2121
return await ToFilteredList(characters, projectId);
2222
}
2323

0 commit comments

Comments
 (0)