ami/tl-vikunja
1
0
Fork 0
Code

fix(views): return tasks directly or in buckets, no matter if accessing via user or link share

Browse Source
This commit is contained in:
kolaente 2024-03-16 12:35:22 +01:00
parent a3714c74fd
commit 5451ddf58d
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/models/task_collection.go
View File

@ -117,6 +117,17 @@ func getTaskFilterOptsFromCollection(tf *TaskCollection, projectView *ProjectVie
return opts, err return opts, err
} }
func getTaskOrTasksInBuckets(s *xorm.Session, a web.Auth, projects []*Project, view *ProjectView, opts *taskSearchOptions) (tasks interface{}, resultCount int, totalItems int64, err error) {
if view != nil {
if view.BucketConfigurationMode != BucketConfigurationModeNone {
tasksInBuckets, err := GetTasksInBucketsForView(s, view, opts, a)
return tasksInBuckets, len(tasksInBuckets), int64(len(tasksInBuckets)), err
}
}
return getTasksForProjects(s, projects, a, opts, view)
}
// ReadAll gets all tasks for a collection // ReadAll gets all tasks for a collection
// @Summary Get tasks in a project // @Summary Get tasks in a project
// @Description Returns all tasks for the current project. // @Description Returns all tasks for the current project.
@ -213,7 +224,7 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
if err != nil { if err != nil {
return nil, 0, 0, err return nil, 0, 0, err
} }
return getTasksForProjects(s, []*Project{project}, a, opts, view) return getTaskOrTasksInBuckets(s, a, []*Project{project}, view, opts)
} }
// If the project ID is not set, we get all tasks for the user. // If the project ID is not set, we get all tasks for the user.
@ -246,12 +257,5 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
projects = []*Project{{ID: tf.ProjectID}} projects = []*Project{{ID: tf.ProjectID}}
} }
if view != nil { return getTaskOrTasksInBuckets(s, a, projects, view, opts)
if view.BucketConfigurationMode != BucketConfigurationModeNone {
tasksInBuckets, err := GetTasksInBucketsForView(s, view, opts, a)
return tasksInBuckets, len(tasksInBuckets), int64(len(tasksInBuckets)), err
}
}
return getTasksForProjects(s, projects, a, opts, view)
} }