ami/tl-vikunja
1
0
Fork 0
Code Activity

fix: namespace collision of global error method with draggable error method

Browse Source
This commit is contained in:
Dominik Pschenitschni
2021-08-25 12:28:29 +02:00
committed by kolaente
parent 0da7a46612
commit ebeca48be4
57 changed files with 229 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/filters/CreateSavedFilter.vue
View File

@ -108,7 +108,7 @@ export default {
this.$store.dispatch('namespaces/loadNamespaces')
this.$router.push({name: 'list.index', params: {listId: r.getListId()}})
})
.catch(e => this.error(e))
.catch(e => this.$message.error(e))
},
},
}

4
src/views/filters/settings/delete.vue
View File

@ -35,10 +35,10 @@ export default {
this.filterService.delete(filter)
.then(() => {
this.$store.dispatch('namespaces/loadNamespaces')
this.success({message: this.$t('filters.delete.success')})
this.$message.success({message: this.$t('filters.delete.success')})
this.$router.push({name: 'namespaces.index'})
})
.catch(e => this.error(e))
.catch(e => this.$message.error(e))
},
},
}

6
src/views/filters/settings/edit.vue
View File

@ -110,19 +110,19 @@ export default {
this.filter = r
this.filters = objectToSnakeCase(this.filter.filters)
})
.catch(e => this.error(e))
.catch(e => this.$message.error(e))
},
save() {
this.filter.filters = this.filters
this.filterService.update(this.filter)
.then(r => {
this.$store.dispatch('namespaces/loadNamespaces')
this.success({message: this.$t('filters.attributes.edit.success')})
this.$message.success({message: this.$t('filters.attributes.edit.success')})
this.filter = r
this.filters = objectToSnakeCase(this.filter.filters)
this.$router.back()
})
.catch(e => this.error(e))
.catch(e => this.$message.error(e))
},
},
}

10
src/views/labels/ListLabels.vue
View File

@ -140,25 +140,25 @@ export default {
loadLabels() {
this.$store.dispatch('labels/loadAllLabels')
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
deleteLabel(label) {
this.$store.dispatch('labels/deleteLabel', label)
.then(() => {
this.success({message: this.$t('label.deleteSuccess')})
this.$message.success({message: this.$t('label.deleteSuccess')})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
editLabelSubmit() {
this.$store.dispatch('labels/updateLabel', this.labelEditLabel)
.then(() => {
this.success({message: this.$t('label.edit.success')})
this.$message.success({message: this.$t('label.edit.success')})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
editLabel(label) {

4
src/views/labels/NewLabel.vue
View File

@ -77,10 +77,10 @@ export default {
name: 'labels.index',
params: {id: r.id},
})
this.success({message: this.$t('label.create.success')})
this.$message.success({message: this.$t('label.create.success')})
})
.catch((e) => {
this.error(e)
this.$message.error(e)
})
},
},

4
src/views/list/NewList.vue
View File

@ -69,14 +69,14 @@ export default {
this.$store
.dispatch('lists/createList', this.list)
.then((r) => {
this.success({message: this.$t('list.create.createdSuccess') })
this.$message.success({message: this.$t('list.create.createdSuccess') })
this.$router.push({
name: 'list.index',
params: { listId: r.id },
})
})
.catch((e) => {
this.error(e)
this.$message.error(e)
})
},
},

2
src/views/list/ShowList.vue
View File

@ -148,7 +148,7 @@ export default {
this.setTitle(this.getListTitle(r))
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
.finally(() => {
this.listLoaded = this.$route.params.listId

4
src/views/list/settings/archive.vue
View File

@ -36,10 +36,10 @@ export default {
.then(r => {
this.$store.commit('currentList', r)
this.$store.commit('namespaces/setListInNamespaceById', r)
this.success({message: this.$t('list.archive.success')})
this.$message.success({message: this.$t('list.archive.success')})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
.finally(() => {
this.$router.back()

14
src/views/list/settings/background.vue
View File

@ -132,7 +132,7 @@ export default {
})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
}, 300)
},
@ -146,10 +146,10 @@ export default {
.then(l => {
this.$store.commit(CURRENT_LIST, l)
this.$store.commit('namespaces/setListInNamespaceById', l)
this.success({message: this.$t('list.background.success')})
this.$message.success({message: this.$t('list.background.success')})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
uploadBackground() {
@ -161,10 +161,10 @@ export default {
.then(l => {
this.$store.commit(CURRENT_LIST, l)
this.$store.commit('namespaces/setListInNamespaceById', l)
this.success({message: this.$t('list.background.success')})
this.$message.success({message: this.$t('list.background.success')})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
removeBackground() {
@ -172,11 +172,11 @@ export default {
.then(l => {
this.$store.commit(CURRENT_LIST, l)
this.$store.commit('namespaces/setListInNamespaceById', l)
this.success({message: this.$t('list.background.removeSuccess')})
this.$message.success({message: this.$t('list.background.removeSuccess')})
this.$router.back()
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
},

4
src/views/list/settings/delete.vue
View File

@ -25,11 +25,11 @@ export default {
this.$store.dispatch('lists/deleteList', list)
.then(() => {
this.success({message: this.$t('list.delete.success')})
this.$message.success({message: this.$t('list.delete.success')})
this.$router.push({name: 'home'})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
},

4
src/views/list/settings/duplicate.vue
View File

@ -48,11 +48,11 @@ export default {
.then(r => {
this.$store.commit('namespaces/addListToNamespace', r.list)
this.$store.commit('lists/setList', r.list)
this.success({message: this.$t('list.duplicate.success')})
this.$message.success({message: this.$t('list.duplicate.success')})
this.$router.push({name: 'list.index', params: {listId: r.list.id}})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
},

6
src/views/list/settings/edit.vue
View File

@ -109,17 +109,17 @@ export default {
this.setTitle(this.$t('list.edit.title', {list: this.list.title}))
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
save() {
this.$store.dispatch('lists/updateList', this.list)
.then(() => {
this.success({message: this.$t('list.edit.success')})
this.$message.success({message: this.$t('list.edit.success')})
this.$router.back()
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
},

2
src/views/list/settings/share.vue
View File

@ -70,7 +70,7 @@ export default {
this.setTitle(this.$t('list.share.title', {list: this.list.title}))
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
},

28
src/views/list/views/Kanban.vue
View File

@ -367,14 +367,14 @@ export default {
bucketId: b.id,
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
}
})
})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
updateTaskPosition(e) {
@ -395,7 +395,7 @@ export default {
this.$store.dispatch('tasks/update', task)
.catch(e => {
this.error(e)
this.$message.error(e)
})
.finally(() => {
this.$set(this.taskUpdating, task.id, false)
@ -419,7 +419,7 @@ export default {
this.$store.commit('kanban/addTaskToBucket', r)
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
.finally(() => {
if (!this.$refs[`tasks-container${bucketId}`][0]) {
@ -444,7 +444,7 @@ export default {
this.showNewBucketInput = false
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
deleteBucketModal(bucketId) {
@ -463,10 +463,10 @@ export default {
this.$store.dispatch('kanban/deleteBucket', {bucket: bucket, params: this.params})
.then(() => {
this.success({message: this.$t('list.kanban.deleteBucketSuccess')})
this.$message.success({message: this.$t('list.kanban.deleteBucketSuccess')})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
.finally(() => {
this.showBucketDeleteModal = false
@ -499,20 +499,20 @@ export default {
.then(r => {
realBucket.title = r.title
bucketTitleElement.blur()
this.success({message: this.$t('list.kanban.bucketTitleSavedSuccess')})
this.$message.success({message: this.$t('list.kanban.bucketTitleSavedSuccess')})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
updateBucket(bucket) {
bucket.limit = parseInt(bucket.limit)
this.$store.dispatch('kanban/updateBucket', bucket)
.then(() => {
this.success({message: this.$t('list.kanban.bucketLimitSavedSuccess')})
this.$message.success({message: this.$t('list.kanban.bucketLimitSavedSuccess')})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
updateBucketPosition(e) {
@ -526,7 +526,7 @@ export default {
this.$store.dispatch('kanban/updateBucket', bucket)
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
setBucketLimit(bucket) {
@ -549,10 +549,10 @@ export default {
bucket.isDoneBucket = !bucket.isDoneBucket
this.$store.dispatch('kanban/updateBucket', bucket)
.then(() => {
this.success({message: this.$t('list.kanban.doneBucketSavedSuccess')})
this.$message.success({message: this.$t('list.kanban.doneBucketSavedSuccess')})
})
.catch(e => {
this.error(e)
this.$message.error(e)
bucket.isDoneBucket = !bucket.isDoneBucket
})
},

4
src/views/namespaces/NewNamespace.vue
View File

@ -78,11 +78,11 @@ export default {
.create(this.namespace)
.then((r) => {
this.$store.commit('namespaces/addNamespace', r)
this.success({message: this.$t('namespace.create.success') })
this.$message.success({message: this.$t('namespace.create.success') })
this.$router.back()
})
.catch((e) => {
this.error(e)
this.$message.error(e)
})
},
},

4
src/views/namespaces/settings/archive.vue
View File

@ -39,10 +39,10 @@ export default {
this.namespaceService.update(this.namespace)
.then(r => {
this.$store.commit('namespaces/setNamespaceById', r)
this.success({message: this.$t('namespace.archive.success')})
this.$message.success({message: this.$t('namespace.archive.success')})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
.finally(() => {
this.$router.back()

4
src/views/namespaces/settings/delete.vue
View File

@ -36,11 +36,11 @@ export default {
this.$store.dispatch('namespaces/deleteNamespace', namespace)
.then(() => {
this.success({message: this.$t('namespace.delete.success')})
this.$message.success({message: this.$t('namespace.delete.success')})
this.$router.push({name: 'home'})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
},

6
src/views/namespaces/settings/edit.vue
View File

@ -119,7 +119,7 @@ export default {
this.setTitle(this.title)
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
save() {
@ -127,11 +127,11 @@ export default {
.then(r => {
// Update the namespace in the parent
this.$store.commit('namespaces/setNamespaceById', r)
this.success({message: this.$t('namespace.edit.success')})
this.$message.success({message: this.$t('namespace.edit.success')})
this.$router.back()
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
},

2
src/views/namespaces/settings/share.vue
View File

@ -70,7 +70,7 @@ export default {
this.setTitle(this.title)
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
},

2
src/views/tasks/ShowTasks.vue
View File

@ -206,7 +206,7 @@ export default {
this.$set(this, 'tasks', tasks)
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
updateTasks(updatedTask) {

12
src/views/tasks/TaskDetailView.vue
View File

@ -567,7 +567,7 @@ export default {
this.setTitle(this.task.title)
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
.finally(() => {
this.$nextTick(() => this.visible = true)
@ -628,10 +628,10 @@ export default {
callback: undoCallback,
}]
}
this.success({message: this.$t('task.detail.updateSuccess')}, actions)
this.$message.success({message: this.$t('task.detail.updateSuccess')}, actions)
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
})
},
@ -656,11 +656,11 @@ export default {
deleteTask() {
this.$store.dispatch('tasks/delete', this.task)
.then(() => {
this.success({message: this.$t('task.detail.deleteSuccess')})
this.$message.success({message: this.$t('task.detail.deleteSuccess')})
this.$router.push({name: 'list.index', params: {listId: this.task.listId}})
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
toggleTaskDone() {
@ -701,7 +701,7 @@ export default {
this.$store.dispatch('namespaces/loadNamespacesIfFavoritesDontExist')
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
},

24
src/views/teams/EditTeam.vue
View File

@ -239,7 +239,7 @@ export default {
this.setTitle(this.title)
})
.catch((e) => {
this.error(e)
this.$message.error(e)
})
},
save() {
@ -253,32 +253,32 @@ export default {
.update(this.team)
.then((response) => {
this.team = response
this.success({message: this.$t('team.edit.success')})
this.$message.success({message: this.$t('team.edit.success')})
})
.catch((e) => {
this.error(e)
this.$message.error(e)
})
},
deleteTeam() {
this.teamService
.delete(this.team)
.then(() => {
this.success({message: this.$t('team.edit.delete.success')})
this.$message.success({message: this.$t('team.edit.delete.success')})
this.$router.push({name: 'teams.index'})
})
.catch((e) => {
this.error(e)
this.$message.error(e)
})
},
deleteUser() {
this.teamMemberService
.delete(this.member)
.then(() => {
this.success({message: this.$t('team.edit.deleteUser.success')})
this.$message.success({message: this.$t('team.edit.deleteUser.success')})
this.loadTeam()
})
.catch((e) => {
this.error(e)
this.$message.error(e)
})
.finally(() => {
this.showUserDeleteModal = false
@ -293,10 +293,10 @@ export default {
.create(newMember)
.then(() => {
this.loadTeam()
this.success({message: this.$t('team.edit.userAddedSuccess')})
this.$message.success({message: this.$t('team.edit.userAddedSuccess')})
})
.catch((e) => {
this.error(e)
this.$message.error(e)
})
},
toggleUserType(member) {
@ -311,14 +311,14 @@ export default {
break
}
}
this.success({
this.$message.success({
message: member.admin ?
this.$t('team.edit.madeAdmin') :
this.$t('team.edit.madeMember'),
})
})
.catch((e) => {
this.error(e)
this.$message.error(e)
})
},
findUser(query) {
@ -333,7 +333,7 @@ export default {
this.$set(this, 'foundUsers', response)
})
.catch((e) => {
this.error(e)
this.$message.error(e)
})
},
clearAll() {

2
src/views/teams/ListTeams.vue
View File

@ -50,7 +50,7 @@ export default {
this.$set(this, 'teams', response)
})
.catch(e => {
this.error(e)
this.$message.error(e)
})
},
},

4
src/views/teams/NewTeam.vue
View File

@ -67,10 +67,10 @@ export default {
name: 'teams.edit',
params: { id: response.id },
})
this.success({message: this.$t('team.create.success') })
this.$message.success({message: this.$t('team.create.success') })
})
.catch((e) => {
this.error(e)
this.$message.error(e)
})
},
},

2
src/views/user/DataExportDownload.vue
View File

@ -57,7 +57,7 @@ export default {
}
this.dataExportService.download(this.password)
.catch(e => this.error(e))
.catch(e => this.$message.error(e))
},
},
}

26
src/views/user/Settings.vue
View File

@ -383,22 +383,22 @@ export default {
updatePassword() {
if (this.passwordConfirm !== this.passwordUpdate.newPassword) {
this.error({message: this.$t('user.settings.passwordsDontMatch')})
this.$message.error({message: this.$t('user.settings.passwordsDontMatch')})
return
}
this.passwordUpdateService.update(this.passwordUpdate)
.then(() => {
this.success({message: this.$t('user.settings.passwordUpdateSuccess')})
this.$message.success({message: this.$t('user.settings.passwordUpdateSuccess')})
})
.catch(e => this.error(e))
.catch(e => this.$message.error(e))
},
updateEmail() {
this.emailUpdateService.update(this.emailUpdate)
.then(() => {
this.success({message: this.$t('user.settings.updateEmailSuccess')})
this.$message.success({message: this.$t('user.settings.updateEmailSuccess')})
})
.catch(e => this.error(e))
.catch(e => this.$message.error(e))
},
totpStatus() {
if (!this.totpEnabled) {
@ -416,7 +416,7 @@ export default {
return
}
this.error(e)
this.$message.error(e)
})
},
totpSetQrCode() {
@ -433,24 +433,24 @@ export default {
this.$set(this, 'totp', r)
this.totpSetQrCode()
})
.catch(e => this.error(e))
.catch(e => this.$message.error(e))
},
totpConfirm() {
this.totpService.enable({passcode: this.totpConfirmPasscode})
.then(() => {
this.$set(this.totp, 'enabled', true)
this.success({message: this.$t('user.settings.totp.confirmSuccess')})
this.$message.success({message: this.$t('user.settings.totp.confirmSuccess')})
})
.catch(e => this.error(e))
.catch(e => this.$message.error(e))
},
totpDisable() {
this.totpService.disable({password: this.totpDisablePassword})
.then(() => {
this.totpEnrolled = false
this.$set(this, 'totp', new TotpModel())
this.success({message: this.$t('user.settings.totp.disableSuccess')})
this.$message.success({message: this.$t('user.settings.totp.disableSuccess')})
})
.catch(e => this.error(e))
.catch(e => this.$message.error(e))
},
updateSettings() {
localStorage.setItem(playSoundWhenDoneKey, this.playSoundWhenDone)
@ -460,9 +460,9 @@ export default {
this.userSettingsService.update(this.settings)
.then(() => {
this.$store.commit('auth/setUserSettings', this.settings)
this.success({message: this.$t('user.settings.general.savedSuccess')})
this.$message.success({message: this.$t('user.settings.general.savedSuccess')})
})
.catch(e => this.error(e))
.catch(e => this.$message.error(e))
},
anchorHashCheck() {
if (window.location.hash === this.$route.hash) {