core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use provided database Engine (#17595) 

- Don't get the engine from `db.DefaultContext`, instead use the
provided one which is passed as paramater `e`.
This commit is contained in:
Gusted 2021-11-09 09:54:46 +01:00 committed by GitHub
parent 03de593402
commit 3a693bd18c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/org.go
View File

@ -412,7 +412,7 @@ func GetUsersWhoCanCreateOrgRepo(orgID int64) ([]*User, error) {
func getUsersWhoCanCreateOrgRepo(e db.Engine, orgID int64) ([]*User, error) { func getUsersWhoCanCreateOrgRepo(e db.Engine, orgID int64) ([]*User, error) {
users := make([]*User, 0, 10) users := make([]*User, 0, 10)
return users, db.GetEngine(db.DefaultContext). return users, e.
Join("INNER", "`team_user`", "`team_user`.uid=`user`.id"). Join("INNER", "`team_user`", "`team_user`.uid=`user`.id").
Join("INNER", "`team`", "`team`.id=`team_user`.team_id"). Join("INNER", "`team`", "`team`.id=`team_user`.team_id").
Where(builder.Eq{"team.can_create_org_repo": true}.Or(builder.Eq{"team.authorize": AccessModeOwner})). Where(builder.Eq{"team.can_create_org_repo": true}.Or(builder.Eq{"team.authorize": AccessModeOwner})).

2
models/user.go
View File

@ -468,7 +468,7 @@ func (u *User) isVisibleToUser(e db.Engine, viewer *User) bool {
} }
// Now we need to check if they in some organization together // Now we need to check if they in some organization together
count, err := db.GetEngine(db.DefaultContext).Table("team_user"). count, err := e.Table("team_user").
Where( Where(
builder.And( builder.And(
builder.Eq{"uid": viewer.ID}, builder.Eq{"uid": viewer.ID},