From 445f1c06fa007ef7b10de40066c99696412dd304 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 16 Mar 2024 15:08:29 +0100
Subject: [PATCH] fix(views): make bucket creation work again

---
 frontend/src/services/bucket.ts              |  8 ++++----
 frontend/src/views/project/ProjectKanban.vue |  2 ++
 pkg/models/kanban_rights.go                  | 10 ++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/frontend/src/services/bucket.ts b/frontend/src/services/bucket.ts
index 0ef42f8768..a353093ff3 100644
--- a/frontend/src/services/bucket.ts
+++ b/frontend/src/services/bucket.ts
@@ -6,10 +6,10 @@ import type { IBucket } from '@/modelTypes/IBucket'
 export default class BucketService extends AbstractService<IBucket> {
 	constructor() {
 		super({
-			getAll: '/projects/{projectId}/buckets',
-			create: '/projects/{projectId}/buckets',
-			update: '/projects/{projectId}/buckets/{id}',
-			delete: '/projects/{projectId}/buckets/{id}',
+			getAll: '/projects/{projectId}/views/{projectViewId}/buckets',
+			create: '/projects/{projectId}/views/{projectViewId}/buckets',
+			update: '/projects/{projectId}/views/{projectViewId}/buckets/{id}',
+			delete: '/projects/{projectId}/views/{projectViewId}/buckets/{id}',
 		})
 	}
 
diff --git a/frontend/src/views/project/ProjectKanban.vue b/frontend/src/views/project/ProjectKanban.vue
index 49f5648040..b041f3ff29 100644
--- a/frontend/src/views/project/ProjectKanban.vue
+++ b/frontend/src/views/project/ProjectKanban.vue
@@ -576,6 +576,7 @@ async function createNewBucket() {
 	await kanbanStore.createBucket(new BucketModel({
 		title: newBucketTitle.value,
 		projectId: project.value.id,
+		projectViewId: viewId,
 	}))
 	newBucketTitle.value = ''
 }
@@ -595,6 +596,7 @@ async function deleteBucket() {
 			bucket: new BucketModel({
 				id: bucketToDelete.value,
 				projectId: project.value.id,
+				projectViewId: viewId,
 			}),
 			params: params.value,
 		})
diff --git a/pkg/models/kanban_rights.go b/pkg/models/kanban_rights.go
index 07b096acca..55958abb36 100644
--- a/pkg/models/kanban_rights.go
+++ b/pkg/models/kanban_rights.go
@@ -23,7 +23,10 @@ import (
 
 // CanCreate checks if a user can create a new bucket
 func (b *Bucket) CanCreate(s *xorm.Session, a web.Auth) (bool, error) {
-	pv := &ProjectView{ID: b.ProjectViewID}
+	pv := &ProjectView{
+		ID:        b.ProjectViewID,
+		ProjectID: b.ProjectID,
+	}
 	return pv.CanUpdate(s, a)
 }
 
@@ -43,6 +46,9 @@ func (b *Bucket) canDoBucket(s *xorm.Session, a web.Auth) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	pv := &ProjectView{ID: bb.ProjectViewID}
+	pv := &ProjectView{
+		ID:        bb.ProjectViewID,
+		ProjectID: bb.ProjectID,
+	}
 	return pv.CanUpdate(s, a)
 }