From 7bb645eaa959b43a878afdbb3057df47a29cfac4 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 23 Oct 2024 01:17:13 +0200 Subject: [PATCH] not needed here and dublicated on related pull --- models/organization/org.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/models/organization/org.go b/models/organization/org.go index fdb1b93d65..c2490145bf 100644 --- a/models/organization/org.go +++ b/models/organization/org.go @@ -658,19 +658,12 @@ func (org *Organization) getUserTeamIDs(ctx context.Context, userID int64) ([]in return teamIDs, db.GetEngine(ctx). Table("team"). Cols("team.id"). - Where(builder.In("team.id", getUserTeamIDsQueryBuilder(org.ID, userID))). + Where("`team_user`.org_id = ?", org.ID). + Join("INNER", "team_user", "`team_user`.team_id = team.id"). + And("`team_user`.uid = ?", userID). Find(&teamIDs) } -func getUserTeamIDsQueryBuilder(orgID, userID int64) *builder.Builder { - return builder.Select("team.id").From("team"). - InnerJoin("team_user", "team_user.team_id = team.id"). - Where(builder.Eq{ - "team_user.org_id": orgID, - "team_user.uid": userID, - }) -} - // TeamsWithAccessToRepo returns all teams that have given access level to the repository. func (org *Organization) TeamsWithAccessToRepo(ctx context.Context, repoID int64, mode perm.AccessMode) ([]*Team, error) { return GetTeamsWithAccessToRepo(ctx, org.ID, repoID, mode)