ami/tl-vikunja
1
0
Fork 0
Code Activity

Merge branch 'main' into fix/vue3

Browse Source 
# Conflicts:
#	src/views/list/settings/edit.vue
This commit is contained in:
Dominik Pschenitschni
2021-10-03 13:24:17 +02:00
parent 0cbffad49d 3f9917dfab
commit 34d0f28678
15 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,6 @@ import AsyncEditor from '@/components/input/AsyncEditor'
import ListModel from '@/models/list'
import ListService from '@/services/list'
import ColorPicker from '@/components/input/colorPicker.vue'
import ListDuplicateService from '@/services/listDuplicateService'
import {CURRENT_LIST} from '@/store/mutation-types'
import CreateEdit from '@/components/misc/create-edit.vue'
@ -81,7 +80,6 @@ export default {
return {
list: ListModel,
listService: new ListService(),
listDuplicateService: new ListDuplicateService(),
}
},
components: {
@ -101,9 +99,7 @@ export default {
this.listService.get(list)
.then(r => {
this.list = r
this.$store.commit(CURRENT_LIST, r)
this.setTitle(this.$t('list.edit.title', {list: this.list.title}))
this.list = { ...r }
})
.catch(e => {
this.$message.error(e)
@ -112,6 +108,8 @@ export default {
save() {
this.$store.dispatch('lists/updateList', this.list)
.then(() => {
this.$store.commit(CURRENT_LIST, this.list)
this.setTitle(this.$t('list.edit.title', {list: this.list.title}))
this.$message.success({message: this.$t('list.edit.success')})
this.$router.back()
})