Merge branch 'advplyr:master' into multi_move

This commit is contained in:
Tiberiu Ichim 2026-02-23 09:45:43 +02:00 committed by GitHub
commit ff884f1135
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions

View file

@ -113,7 +113,7 @@ class AuthorController {
payload.lastFirst = Database.authorModel.getLastFirst(payload.name)
}
// Check if author name matches another author and merge the authors
// Check if author name matches another author in the same library and merge the authors
let existingAuthor = null
if (authorNameUpdate) {
existingAuthor = await Database.authorModel.findOne({
@ -121,7 +121,8 @@ class AuthorController {
id: {
[sequelize.Op.not]: req.author.id
},
name: payload.name
name: payload.name,
libraryId: req.author.libraryId
}
})
}