git724/forgejo
1
0
Fork 0
Code Issues Pull requests 3 Projects 1 Releases Packages Wiki Activity

bug fixed for #540

Browse source
This commit is contained in:
lunnyxiao 2014-10-11 13:24:36 +08:00
commit e848b17fab
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
models/org.go
View file

@ -845,7 +845,8 @@ func IsTeamMember(orgId, teamId, uid int64) bool {
// GetTeamMembers returns all members in given team of organization. // GetTeamMembers returns all members in given team of organization.
func GetTeamMembers(orgId, teamId int64) ([]*User, error) { func GetTeamMembers(orgId, teamId int64) ([]*User, error) {
tus := make([]*TeamUser, 0, 10) /*tus := make([]*TeamUser, 0, 10)
err := x.Where("org_id=?", orgId).And("team_id=?", teamId).Find(&tus) err := x.Where("org_id=?", orgId).And("team_id=?", teamId).Find(&tus)
if err != nil { if err != nil {
return nil, err return nil, err
@ -857,8 +858,11 @@ func GetTeamMembers(orgId, teamId int64) ([]*User, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }*/
return us, nil
us := make([]*User, 0)
err := x.Sql("select * from user join team_user on team_user.team_id = ? and team_user.uid = user.id", teamId).Find(&us)
return us, err
} }
// GetUserTeams returns all teams that user belongs to in given origanization. // GetUserTeams returns all teams that user belongs to in given origanization.