Merge branch 'vue3' into feature/vue3-async-await
# Conflicts: # src/i18n/index.js # src/store/modules/labels.js # src/store/modules/tasks.js # src/views/list/views/Kanban.vue # src/views/tasks/ShowTasks.vue # src/views/tasks/TaskDetailView.vue
This commit is contained in:
@ -207,9 +207,7 @@ export default {
|
||||
// soonest before the later ones.
|
||||
// We can't use the api sorting here because that sorts tasks with a due date after
|
||||
// ones without a due date.
|
||||
this.tasks = tasks.sort((a, b) => {
|
||||
return Number(b.dueDate === null) - Number(a.dueDate === null)
|
||||
})
|
||||
this.tasks = tasks.sort((a, b) => a.dueDate - b.dueDate)
|
||||
},
|
||||
|
||||
// FIXME: this modification should happen in the store
|
||||
|
@ -510,7 +510,10 @@ export default {
|
||||
},
|
||||
parent: {
|
||||
handler(parent) {
|
||||
this.$store.dispatch(CURRENT_LIST, parent !== null ? parent.list : this.currentList)
|
||||
const parentList = parent !== null ? parent.list : null
|
||||
if (parentList !== null) {
|
||||
this.$store.commit(CURRENT_LIST, parentList)
|
||||
}
|
||||
},
|
||||
immediate: true,
|
||||
},
|
||||
|
Reference in New Issue
Block a user