ami/tl-vikunja
1
0
Fork 0
Code

fix(project): remove namespaces from getting projects

Browse Source
This commit is contained in:
kolaente 2022-12-29 18:14:59 +01:00
parent ac0d84a7d8
commit 2dcd6451a4
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/models/project.go
View File

@ -403,20 +403,13 @@ func getUserProjectsStatement(userID int64, search string, getArchived bool) *bu
return builder.Dialect(dialect). return builder.Dialect(dialect).
Select("l.*"). Select("l.*").
From("projects", "l"). From("projects", "l").
// TODO: remove namespaces
Join("INNER", "namespaces n", "l.namespace_id = n.id").
Join("LEFT", "team_namespaces tn", "tn.namespace_id = n.id").
Join("LEFT", "team_members tm", "tm.team_id = tn.team_id").
Join("LEFT", "team_projects tl", "l.id = tl.project_id"). Join("LEFT", "team_projects tl", "l.id = tl.project_id").
Join("LEFT", "team_members tm2", "tm2.team_id = tl.team_id"). 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.id").
Join("LEFT", "users_namespaces un", "un.namespace_id = l.namespace_id").
Where(builder.And( Where(builder.And(
builder.Or( builder.Or(
builder.Eq{"tm.user_id": userID},
builder.Eq{"tm2.user_id": userID}, builder.Eq{"tm2.user_id": userID},
builder.Eq{"ul.user_id": userID}, builder.Eq{"ul.user_id": userID},
builder.Eq{"un.user_id": userID},
builder.Eq{"l.owner_id": userID}, builder.Eq{"l.owner_id": userID},
), ),
filterCond, filterCond,