ami/tl-vikunja
1
0
Fork 0
Code Activity

fix(tasks): get all tasks from parent projects

Browse Source
This commit is contained in:
kolaente
2023-01-07 12:41:11 +01:00
parent ceaa9c0e03
commit 537ba60f2d
7 changed files with 75 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/models/project.go
View File

@ -405,19 +405,21 @@ func getUserProjectsStatement(parentProjectIDs []int64, userID int64, search str
var parentCondition builder.Cond
parentCondition = builder.Or(
builder.IsNull{"parent_project_id"},
builder.Eq{"parent_project_id": 0},
builder.IsNull{"l.parent_project_id"},
builder.Eq{"l.parent_project_id": 0},
)
projectCol := "id"
if len(parentProjectIDs) > 0 {
parentCondition = builder.In("parent_project_id", parentProjectIDs)
parentCondition = builder.In("l.parent_project_id", parentProjectIDs)
projectCol = "parent_project_id"
}
return builder.Dialect(dialect).
Select("l.*").
From("projects", "l").
Join("LEFT", "team_projects tl", "l.id = tl.project_id").
Join("LEFT", "team_projects tl", "tl.project_id = l."+projectCol).
Join("LEFT", "team_members tm2", "tm2.team_id = tl.team_id").
Join("LEFT", "users_projects ul", "ul.project_id = l.id").
Join("LEFT", "users_projects ul", "ul.project_id = l."+projectCol).
Where(builder.And(
builder.Or(
builder.Eq{"tm2.user_id": userID},