Fixed merge ignoring assigned scene tags.

This commit is contained in:
2026-07-08 03:25:31 +02:00
parent 6779caccef
commit 93c31888b2
3 changed files with 9 additions and 3 deletions

View File

@@ -693,6 +693,10 @@ export async function mergeActors(targetActorId, sourceActorIds, reqUser) {
.whereIn('actor_id', sourceActorIds)
.returning('release_id');
await trx('releases_tags')
.update('actor_id', targetActorId)
.whereIn('actor_id', sourceActorIds);
const [targetActorStashes, sourceActorStashes] = await Promise.all([
trx('stashes_actors')
.where('actor_id', targetActorId),

View File

@@ -228,7 +228,7 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
.whereIn('release_id', sceneIds)
.leftJoin('actors as directors', 'directors.id', 'releases_directors.director_id'),
tags: knex('releases_tags')
.select('tags.id', 'slug', 'name', 'priority', 'release_id', 'actor_id')
.select('tags.id', 'tags.slug', 'tags.name', 'tags.priority', 'releases_tags.release_id', 'actor_id')
.leftJoin('tags', 'tags.id', 'releases_tags.tag_id')
.whereNotNull('tags.id')
.whereIn('release_id', sceneIds)