ami/tl-vikunja
1
0
Fork 0
Code Activity

feat(views)!: move done and default bucket setting to view

Browse Source
This commit is contained in:
kolaente
2024-03-15 11:27:31 +01:00
parent 006f932dc4
commit 9cf84646a1
6 changed files with 177 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/models/kanban.go
View File

@ -82,14 +82,14 @@ func getBucketByID(s *xorm.Session, id int64) (b *Bucket, err error) {
return
}
func getDefaultBucketID(s *xorm.Session, project *Project) (bucketID int64, err error) {
if project.DefaultBucketID != 0 {
return project.DefaultBucketID, nil
func getDefaultBucketID(s *xorm.Session, view *ProjectView) (bucketID int64, err error) {
if view.DefaultBucketID != 0 {
return view.DefaultBucketID, nil
}
bucket := &Bucket{}
_, err = s.
Where("project_id = ?", project.ID).
Where("project_view_id = ?", view.ID).
OrderBy("position asc").
Get(bucket)
if err != nil {
@ -369,7 +369,7 @@ func (b *Bucket) Delete(s *xorm.Session, a web.Auth) (err error) {
}
// Get the default bucket
p, err := GetProjectSimpleByID(s, b.ProjectID)
p, err := GetProjectViewByID(s, b.ProjectViewID, b.ProjectID)
if err != nil {
return
}