groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-03-01 05:29:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix: Handle database merge and redirect during consolidation conflicts

Browse source
This commit is contained in:
Tiberiu Ichim 2026-02-17 15:55:38 +02:00
parent 38d43c0163
commit 3ba2551ba1
2 changed files with 92 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/layouts/default.vue
View file

@ -627,9 +627,16 @@ export default {
this.processingConsolidationConflict = true
const axios = this.$axios || this.$nuxt.$axios
try {
await axios.$post(`/api/items/${this.consolidationConflictItem.id}/consolidate`, payload)
const data = await axios.$post(`/api/items/${this.consolidationConflictItem.id}/consolidate`, payload)
this.$toast.success(this.$strings.ToastConsolidateSuccess || 'Consolidation successful')
this.showConsolidationConflictModal = false
if (data.mergedInto) {
const id = data.mergedInto
if (this.$route.name.startsWith('item') && this.$route.params.id === this.consolidationConflictItem.id) {
this.$router.push(`/item/${id}`)
}
}
} catch (error) {
console.error('Failed to resolve consolidation conflict', error)
this.$toast.error(error.response?.data?.error || error.response?.data || 'Failed to resolve conflict')