Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-02-07 16:05:47 +01:00
Code Issues Projects Releases Wiki Activity

Create aliases when merging performers

Browse source
This commit is contained in:
sezzim 2026-01-11 16:08:12 -08:00
parent 9b709ef614
commit 36e5801ad0
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/sqlite/performer.go
View file

@ -939,6 +939,16 @@ AND NOT EXISTS(SELECT 1 FROM `+table+` o WHERE o.`+idColumn+` = `+table+`.`+idCo
}
}
_, err := dbWrapper.Exec(ctx, "INSERT INTO "+performersAliasesTable+" (performer_id, alias) SELECT ?, name FROM "+performerTable+" WHERE id IN "+inBinding, args...)
if err != nil {
return err
}
_, err = dbWrapper.Exec(ctx, "UPDATE "+performersAliasesTable+" SET performer_id = ? WHERE performer_id IN "+inBinding, args...)
if err != nil {
return err
}
for _, id := range source {
err := qb.Destroy(ctx, id)
if err != nil {

10
ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
View file

@ -206,13 +206,11 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
)
);
// default alias list should be the existing aliases, plus the names of all sources,
// plus all source aliases, deduplicated
// Default alias list should be the existing aliases, plus all source
// aliases, deduplicated. The backend will add the source names as
// aliases.
const allAliases = uniq(
dest.alias_list.concat(
sources.map((s) => s.name),
sources.flatMap((s) => s.alias_list)
)
dest.alias_list.concat(sources.flatMap((s) => s.alias_list))
);
setAliases(