From 9c603d9b380983590017dd28592e2f897463d480 Mon Sep 17 00:00:00 2001 From: Silvan Date: Thu, 19 Nov 2020 15:21:22 +0100 Subject: [PATCH] fix: query correct column (#991) * fix(management): search user grants with granted * fix(auth): handle user grant project owner * fix: grantowner to resourceowner * fix: generate mock * fix: mig * fix: query correct columns * fix: remove new line --- internal/usergrant/repository/view/user_grant_view.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/usergrant/repository/view/user_grant_view.go b/internal/usergrant/repository/view/user_grant_view.go index 68d5e65384..aa36907b69 100644 --- a/internal/usergrant/repository/view/user_grant_view.go +++ b/internal/usergrant/repository/view/user_grant_view.go @@ -57,9 +57,9 @@ func SearchUserGrants(db *gorm.DB, table string, req *grant_model.UserGrantSearc } if withGranted { - db = db.Where("grant_owner = ? OR project_owner = ?", orgID, orgID) + db = db.Where("resource_owner = ? OR project_owner = ?", orgID, orgID) } else { - db = db.Where("grant_owner = ?", orgID) + db = db.Where("resource_owner = ?", orgID) } query := repository.PrepareSearchQuery(table, model.UserGrantSearchRequest{Limit: req.Limit, Offset: req.Offset, Queries: req.Queries}) count, err := query(db, &grants)