peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix listing team members (#3048)

Browse Source
This commit is contained in:
Kim Carlbäcker 2016-05-07 02:02:36 +02:00 committed by Unknwon
parent 13216c5c20
commit 3c0c7a9f83
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/org.go
View File

@ -443,7 +443,7 @@ func RemoveOrgRepo(orgID, repoID int64) error {
// that the user with the given userID has access to. // that the user with the given userID has access to.
func (org *User) GetUserRepositories(userID int64) (err error) { func (org *User) GetUserRepositories(userID int64) (err error) {
teams := make([]*Team, 0, org.NumTeams) teams := make([]*Team, 0, org.NumTeams)
if err = x.Sql(`SELECT team.id FROM team if err = x.Sql(`SELECT team.id FROM team
INNER JOIN team_user ON team_user.team_id = team.id INNER JOIN team_user ON team_user.team_id = team.id
WHERE team_user.org_id = ? AND team_user.uid = ?`, org.Id, userID).Find(&teams); err != nil { WHERE team_user.org_id = ? AND team_user.uid = ?`, org.Id, userID).Find(&teams); err != nil {
return fmt.Errorf("get teams: %v", err) return fmt.Errorf("get teams: %v", err)
@ -484,6 +484,8 @@ WHERE team_user.org_id = ? AND team_user.uid = ?`,
return fmt.Errorf("get teams: %v", err) return fmt.Errorf("get teams: %v", err)
} }
org.Teams = teams
// FIXME: should I change this value inside method, // FIXME: should I change this value inside method,
// or only in location of caller where it's really needed? // or only in location of caller where it's really needed?
org.NumTeams = len(org.Teams) org.NumTeams = len(org.Teams)