ami/tl-vikunja
1
0
Fork 0
Code

fix(views): reset bucket when moving tasks between projects

Browse Source
This commit is contained in:
kolaente 2024-03-19 14:16:05 +01:00
parent e940db6d32
commit 165d291cd5
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
pkg/models/tasks.go
View File

@ -920,41 +920,6 @@ func (t *Task) Update(s *xorm.Session, a web.Auth) (err error) {
// Old task has the stored reminders // Old task has the stored reminders
ot.Reminders = reminders ot.Reminders = reminders
views, err := getViewsForProject(s, t.ProjectID)
if err != nil {
return err
}
buckets := make(map[int64]*Bucket)
err = s.In("project_view_id",
builder.Select("id").
From("project_views").
Where(builder.Eq{"project_id": t.ProjectID}),
).
Find(&buckets)
if err != nil {
return err
}
for _, view := range views {
// Only update the bucket when the current view
var targetBucketID int64
if t.BucketID != 0 {
bucket, has := buckets[t.BucketID]
if !has {
return ErrBucketDoesNotExist{BucketID: t.BucketID}
}
if has && bucket.ProjectViewID == view.ID {
targetBucketID = t.BucketID
}
}
err = setTaskBucket(s, t, &ot, view, targetBucketID)
if err != nil {
return err
}
}
// When a repeating task is marked as done, we update all deadlines and reminders and set it as undone // When a repeating task is marked as done, we update all deadlines and reminders and set it as undone
updateDone(&ot, t) updateDone(&ot, t)
@ -993,9 +958,45 @@ func (t *Task) Update(s *xorm.Session, a web.Auth) (err error) {
if err != nil { if err != nil {
return err return err
} }
t.BucketID = 0
colsToUpdate = append(colsToUpdate, "index") colsToUpdate = append(colsToUpdate, "index")
} }
views, err := getViewsForProject(s, t.ProjectID)
if err != nil {
return err
}
buckets := make(map[int64]*Bucket)
err = s.In("project_view_id",
builder.Select("id").
From("project_views").
Where(builder.Eq{"project_id": t.ProjectID}),
).
Find(&buckets)
if err != nil {
return err
}
for _, view := range views {
// Only update the bucket when the current view
var targetBucketID int64
if t.BucketID != 0 {
bucket, has := buckets[t.BucketID]
if !has {
return ErrBucketDoesNotExist{BucketID: t.BucketID}
}
if has && bucket.ProjectViewID == view.ID {
targetBucketID = t.BucketID
}
}
err = setTaskBucket(s, t, &ot, view, targetBucketID)
if err != nil {
return err
}
}
// If a task attachment is being set as cover image, check if the attachment actually belongs to the task // If a task attachment is being set as cover image, check if the attachment actually belongs to the task
if t.CoverImageAttachmentID != 0 { if t.CoverImageAttachmentID != 0 {
is, err := s.Exist(&TaskAttachment{ is, err := s.Exist(&TaskAttachment{