Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent duplicate records in organizations list when creating a repository #11303

Merged
merged 10 commits into from
May 7, 2020
Merged

Prevent duplicate records in organizations list when creating a repository #11303

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
71693ed
FIX GetOrgsCanCreateRepoByUserID
6543 May 5, 2020
b4e45d7
does this fix it?
6543 May 5, 2020
af92fc8
as per @zeripath
6543 May 5, 2020
25a3e85
make ON capitals
zeripath May 5, 2020
1831ae6
Merge branch 'master' into fix-GetOrgsCanCreateRepoByUserID_11258
6543 May 5, 2020
852cea0
use builder
6543 May 5, 2020
a0f17e2
remove GroupBy
6543 May 6, 2020
34e7df1
Merge branch 'master' into fix-GetOrgsCanCreateRepoByUserID_11258
6543 May 6, 2020
d4777e4
Merge branch 'master' into fix-GetOrgsCanCreateRepoByUserID_11258
6543 May 6, 2020
3cb4283
Merge branch 'master' into fix-GetOrgsCanCreateRepoByUserID_11258
6543 May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions models/org.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,12 +473,12 @@ func GetOwnedOrgsByUserIDDesc(userID int64, desc string) ([]*User, error) {
func GetOrgsCanCreateRepoByUserID(userID int64) ([]*User, error) {
orgs := make([]*User, 0, 10)

return orgs, x.Join("INNER", "`team_user`", "`team_user`.org_id=`user`.id").
Join("INNER", "`team`", "`team`.id=`team_user`.team_id").
Where("`team_user`.uid=?", userID).
And(builder.Eq{"`team`.authorize": AccessModeOwner}.Or(builder.Eq{"`team`.can_create_org_repo": true})).
Desc("`user`.updated_unix").
Find(&orgs)
return orgs, x.Where(builder.In("id", builder.Select("`user`.id").From("`user`").
Join("INNER", "`team_user`", "`team_user`.org_id = `user`.id").
Join("INNER", "`team`", "`team`.id = `team_user`.team_id").
Where(builder.Eq{"`team_user`.uid": userID}).
And(builder.Eq{"`team`.authorize": AccessModeOwner}.Or(builder.Eq{"`team`.can_create_org_repo": true})))).
Desc("`user`.updated_unix").Find(&orgs)
}

// GetOrgUsersByUserID returns all organization-user relations by user ID.
Expand Down