Skip to content

Remove NewSession method from db.Engine interface #17577

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

Merged
merged 7 commits into from
Nov 21, 2021
Merged

Remove NewSession method from db.Engine interface #17577

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
67ae74d
Remove NewSession method from db.Engine interface
lunny Nov 7, 2021
b2fc08a
Fix bug
lunny Nov 7, 2021
42a9c98
Some improvements
lunny Nov 13, 2021
1dc98ac
Fix bug
lunny Nov 13, 2021
ebccf6c
Fix test
lunny Nov 20, 2021
33f6a18
Use XXXBean instead of XXXExample
lunny Nov 20, 2021
ae88150
Merge branch 'main' into lunny/remove_newsession
lunny Nov 21, 2021
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
Prev Previous commit
Next Next commit
Fix bug
  • Loading branch information
@lunny
lunny committed Nov 21, 2021
commit b2fc08afc827e95fcfaade7df93781ccd75e6088
8 changes: 4 additions & 4 deletions models/org.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,21 +440,21 @@ func getUsersWhoCanCreateOrgRepo(e db.Engine, orgID int64) ([]*User, error) {
And("team_user.org_id = ?", orgID).Asc("`user`.name").Find(&users)
}

func getOrgsByUserID(sess db.Engine, userID int64, showAll bool) ([]*User, error) {
func getOrgsByUserID(e db.Engine, userID int64, showAll bool) ([]*Organization, error) {
orgs := make([]*Organization, 0, 10)
sess := e.Where("`org_user`.uid=?", userID)
if !showAll {
sess.Where("`org_user`.is_public=?", true)
sess = sess.Where("`org_user`.is_public=?", true)
}
return orgs, sess.
Where("`org_user`.uid=?", userID).
Join("INNER", "`org_user`", "`org_user`.org_id=`user`.id").
Asc("`user`.name").
Find(&orgs)
}

// GetOrgsByUserID returns a list of organizations that the given user ID
// has joined.
func GetOrgsByUserID(userID int64, showAll bool) ([]*User, error) {
func GetOrgsByUserID(userID int64, showAll bool) ([]*Organization, error) {
return getOrgsByUserID(db.GetEngine(db.DefaultContext), userID, showAll)
}

Expand Down