mirror of
https://github.com/advplyr/audiobookshelf.git
synced 2026-03-02 14:09:43 +00:00
Merge branch 'advplyr:master' into feat/metadata-id-matching
This commit is contained in:
commit
cf18cd9fbf
45 changed files with 843 additions and 118 deletions
|
|
@ -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
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue