AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move aliases up (not happy with how it looks still)

Browse source
This commit is contained in:
Amelia 2025-05-07 19:42:10 +02:00
parent fc39a2035f
commit 697a3bb52b
No known key found for this signature in database
GPG key ID: D6D0ECE365407EAA
4 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
API/Controllers/PersonController.cs
View file

@ -1,5 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using API.Data; using API.Data;
using API.Data.Repositories; using API.Data.Repositories;
@ -187,7 +186,7 @@ public class PersonController : BaseApiController
/// <param name="dto"></param> /// <param name="dto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("merge")] [HttpPost("merge")]
public async Task<ActionResult<PersonDto>> MergePersons(PersonMergeDto dto) public async Task<ActionResult<PersonDto>> MergePeople(PersonMergeDto dto)
{ {
var dst = await _unitOfWork.PersonRepository.GetPersonById(dto.DestId, PersonIncludes.All); var dst = await _unitOfWork.PersonRepository.GetPersonById(dto.DestId, PersonIncludes.All);
if (dst == null) return BadRequest(); if (dst == null) return BadRequest();

1
API/Extensions/QueryExtensions/IncludesExtensions.cs
View file

@ -1,7 +1,6 @@
using System.Linq; using System.Linq;
using API.Data.Repositories; using API.Data.Repositories;
using API.Entities; using API.Entities;
using API.Entities.Metadata;
using API.Entities.Person; using API.Entities.Person;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;

5
API/Helpers/Builders/PersonBuilder.cs
View file

@ -1,8 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using API.Entities;
using API.Entities.Enums;
using API.Entities.Metadata;
using API.Entities.Person; using API.Entities.Person;
using API.Extensions; using API.Extensions;
@ -37,7 +34,7 @@ public class PersonBuilder : IEntityBuilder<Person>
public PersonBuilder WithAlias(string alias) public PersonBuilder WithAlias(string alias)
{ {
if (_person.Aliases.Any(a => a.NormalizedAlias.Equals(alias))) if (_person.Aliases.Any(a => a.NormalizedAlias.Equals(alias.ToNormalized())))
{ {
return this; return this;
} }

9
UI/Web/src/app/person-detail/person-detail.component.html
View file

@ -16,6 +16,11 @@
} }
</h2> </h2>
</ng-container> </ng-container>
<ng-container subtitle>
@if (person.aliases.length > 0) {
<span>{{t('aka')}} {{person.aliases.join(", ")}}</span>
}
</ng-container>
</app-side-nav-companion-bar> </app-side-nav-companion-bar>
</div> </div>
@ -43,10 +48,6 @@
<div class="col-xl-10 col-lg-7 col-md-12 col-xs-12 col-sm-12 mt-2"> <div class="col-xl-10 col-lg-7 col-md-12 col-xs-12 col-sm-12 mt-2">
<div class="row g-0 mt-2"> <div class="row g-0 mt-2">
@if (person.aliases.length > 0) {
<!-- I can't UI, help! -->
<span>{{t('aka')}} {{person.aliases.join(", ")}}</span>
}
<app-read-more [text]="person.description || t('no-info')"></app-read-more> <app-read-more [text]="person.description || t('no-info')"></app-read-more>
@if (roles$ | async; as roles) { @if (roles$ | async; as roles) {