femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

make sure units of a team are returned (#6379) (#6381)

Browse source
This commit is contained in:
Lanre Adelowo 2019-03-19 23:40:54 +01:00 committed by techknowlogick
parent 3934d9cd2f
commit 16815306ad
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
models/org_team.go
View file

@ -33,6 +33,11 @@ type Team struct {
Units []*TeamUnit `xorm:"-"` Units []*TeamUnit `xorm:"-"`
} }
// GetUnits return a list of available units for a team
func (t *Team) GetUnits() error {
return t.getUnits(x)
}
func (t *Team) getUnits(e Engine) (err error) { func (t *Team) getUnits(e Engine) (err error) {
if t.Units != nil { if t.Units != nil {
return nil return nil

5
routers/api/v1/org/team.go
View file

@ -38,6 +38,11 @@ func ListTeams(ctx *context.APIContext) {
apiTeams := make([]*api.Team, len(org.Teams)) apiTeams := make([]*api.Team, len(org.Teams))
for i := range org.Teams { for i := range org.Teams {
if err := org.Teams[i].GetUnits(); err != nil {
ctx.Error(500, "GetUnits", err)
return
}
apiTeams[i] = convert.ToTeam(org.Teams[i]) apiTeams[i] = convert.ToTeam(org.Teams[i])
} }
ctx.JSON(200, apiTeams) ctx.JSON(200, apiTeams)