fix(kanban): move repeating task back to old bucket when moved to the done bucket
This commit is contained in:
parent
51040cf1af
commit
323ecdaab6
@ -40,11 +40,11 @@
|
|||||||
</slot>
|
</slot>
|
||||||
|
|
||||||
<input
|
<input
|
||||||
|
:id="id"
|
||||||
ref="searchInput"
|
ref="searchInput"
|
||||||
v-model="query"
|
v-model="query"
|
||||||
type="text"
|
type="text"
|
||||||
class="input"
|
class="input"
|
||||||
:id="id"
|
|
||||||
:name="name"
|
:name="name"
|
||||||
:placeholder="placeholder"
|
:placeholder="placeholder"
|
||||||
:autocomplete="autocompleteEnabled ? undefined : 'off'"
|
:autocomplete="autocompleteEnabled ? undefined : 'off'"
|
||||||
|
@ -71,7 +71,6 @@
|
|||||||
trigger-icon="ellipsis-v"
|
trigger-icon="ellipsis-v"
|
||||||
@close="() => showSetLimitInput = false"
|
@close="() => showSetLimitInput = false"
|
||||||
>
|
>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-if="showSetLimitInput"
|
v-if="showSetLimitInput"
|
||||||
class="field has-addons"
|
class="field has-addons"
|
||||||
@ -523,6 +522,11 @@ async function updateTaskPosition(e) {
|
|||||||
projectId: project.value.id,
|
projectId: project.value.id,
|
||||||
}))
|
}))
|
||||||
newTask.done = updatedTaskBucket.taskDone
|
newTask.done = updatedTaskBucket.taskDone
|
||||||
|
if (updatedTaskBucket.bucketId !== newTask.bucketId) {
|
||||||
|
kanbanStore.removeTaskInBucket(newTask)
|
||||||
|
newTask.bucketId = updatedTaskBucket.bucketId
|
||||||
|
kanbanStore.addTaskToBucket(newTask)
|
||||||
|
}
|
||||||
kanbanStore.setTaskInBucket(newTask)
|
kanbanStore.setTaskInBucket(newTask)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,11 +116,12 @@ func (b *TaskBucket) Update(s *xorm.Session, a web.Auth) (err error) {
|
|||||||
if view.DoneBucketID == b.BucketID {
|
if view.DoneBucketID == b.BucketID {
|
||||||
doneChanged = true
|
doneChanged = true
|
||||||
task.Done = true
|
task.Done = true
|
||||||
if task.RepeatAfter > 0 {
|
if task.isRepeating() {
|
||||||
oldTask := task
|
oldTask := task
|
||||||
task.Done = false
|
task.Done = false
|
||||||
updateDone(&oldTask, &task)
|
updateDone(&oldTask, &task)
|
||||||
updateBucket = false
|
updateBucket = false
|
||||||
|
b.BucketID = oldTaskBucket.BucketID
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -146,7 +147,6 @@ func (b *TaskBucket) Update(s *xorm.Session, a web.Auth) (err error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if updateBucket {
|
if updateBucket {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user