From 58e492872ab074997dbdc4a35542cf56d135f42b Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 17 Jul 2024 09:32:29 +0200
Subject: [PATCH] fix(kanban): put task into correct bucket when creating via
 kanban board

---
 pkg/models/tasks.go | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go
index d564b688b..2ba975231 100644
--- a/pkg/models/tasks.go
+++ b/pkg/models/tasks.go
@@ -751,6 +751,11 @@ func createTask(s *xorm.Session, t *Task, a web.Auth, updateAssignees bool, setB
 		return err
 	}
 
+	var providedBucket *Bucket
+	if t.BucketID != 0 {
+		providedBucket, err = getBucketByID(s, t.BucketID)
+	}
+
 	views, err := getViewsForProject(s, t.ProjectID)
 	if err != nil {
 		return err
@@ -766,9 +771,13 @@ func createTask(s *xorm.Session, t *Task, a web.Auth, updateAssignees bool, setB
 
 			bucketID := view.DoneBucketID
 			if !t.Done || view.DoneBucketID == 0 {
-				bucketID, err = getDefaultBucketID(s, view)
-				if err != nil {
-					return err
+				if providedBucket != nil && view.ID == providedBucket.ProjectViewID {
+					bucketID = providedBucket.ID
+				} else {
+					bucketID, err = getDefaultBucketID(s, view)
+					if err != nil {
+						return err
+					}
 				}
 			}