From d6b00da049c86f0f063458eaa2420602ec94a4dc Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Sat, 13 May 2023 09:06:13 +0000 Subject: [PATCH] Fix `organization` field being null in `GET /api/v1/teams/{id}` Enabled the organization loading flag. # Before ```json { "id": 1, "name": "Owners", "description": "", "organization": null, "includes_all_repositories": true, "permission": "owner", "units": [ "repo.code", "repo.issues", "repo.wiki", "repo.ext_wiki", "repo.actions", "repo.ext_issues", "repo.pulls", "repo.releases", "repo.projects", "repo.packages" ], "units_map": { "repo.actions": "owner", "repo.code": "owner", "repo.ext_issues": "owner", "repo.ext_wiki": "owner", "repo.issues": "owner", "repo.packages": "owner", "repo.projects": "owner", "repo.pulls": "owner", "repo.releases": "owner", "repo.wiki": "owner" }, "can_create_org_repo": true } ``` # After ```json { "id": 1, "name": "Owners", "description": "", "organization": { "id": 2, "name": "bigorg", "full_name": "", "avatar_url": "https://3000-yardenshoham-gitea-3gfrlc9gn4h.ws-us96b.gitpod.io/avatars/e2649b0c016d9102664a7d4349503eb9", "description": "", "website": "", "location": "", "visibility": "public", "repo_admin_change_team_access": true, "username": "bigorg" }, "includes_all_repositories": true, "permission": "owner", "units": [ "repo.ext_issues", "repo.pulls", "repo.wiki", "repo.ext_wiki", "repo.packages", "repo.code", "repo.issues", "repo.releases", "repo.projects", "repo.actions" ], "units_map": { "repo.actions": "owner", "repo.code": "owner", "repo.ext_issues": "owner", "repo.ext_wiki": "owner", "repo.issues": "owner", "repo.packages": "owner", "repo.projects": "owner", "repo.pulls": "owner", "repo.releases": "owner", "repo.wiki": "owner" }, "can_create_org_repo": true } ``` Signed-off-by: Yarden Shoham --- routers/api/v1/org/team.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go index 024fee34693c..8b7d7b195151 100644 --- a/routers/api/v1/org/team.go +++ b/routers/api/v1/org/team.go @@ -126,7 +126,7 @@ func GetTeam(ctx *context.APIContext) { // "200": // "$ref": "#/responses/Team" - apiTeam, err := convert.ToTeam(ctx, ctx.Org.Team) + apiTeam, err := convert.ToTeam(ctx, ctx.Org.Team, true) if err != nil { ctx.InternalServerError(err) return