From 1d2cdf0fb8d93302595e4e8dded0525ca729c83c Mon Sep 17 00:00:00 2001 From: konrad Date: Thu, 9 Jan 2020 19:24:08 +0000 Subject: [PATCH] Fix owner field being null for user shared namespaces (#119) --- pkg/models/namespace.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/models/namespace.go b/pkg/models/namespace.go index 5da41cf813b..932d0a704d7 100644 --- a/pkg/models/namespace.go +++ b/pkg/models/namespace.go @@ -181,9 +181,11 @@ func (n *Namespace) ReadAll(a web.Auth, search string, page int, perPage int) (r Table("namespaces"). Join("LEFT", "team_namespaces", "namespaces.id = team_namespaces.namespace_id"). Join("LEFT", "team_members", "team_members.team_id = team_namespaces.team_id"). + Join("LEFT", "users_namespace", "users_namespace.namespace_id = namespaces.id"). Join("INNER", "users", "users.id = namespaces.owner_id"). Where("team_members.user_id = ?", doer.ID). Or("namespaces.owner_id = ?", doer.ID). + Or("users_namespace.user_id = ?", doer.ID). GroupBy("users.id"). Find(&users)