1
0

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:
Dominik Pschenitschni
2021-10-17 16:06:58 +02:00
14 changed files with 223 additions and 158 deletions

View File

@ -405,7 +405,7 @@ export default {
tasks,
}
this.$store.dispatch('kanban/updateBucket', newBucket)
this.$store.commit('kanban/setBucketById', newBucket)
},
async updateTaskPosition(e) {

View File

@ -74,9 +74,8 @@
</a>
</nothing>
<div class="tasks-container">
<div class="tasks-container" :class="{ 'has-task-edit-open': isTaskEdit }">
<div
:class="{ short: isTaskEdit }"
class="tasks mt-0"
v-if="tasks && tasks.length > 0"
>

View File

@ -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

View File

@ -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,
},