From cf17b5fad90ecedbbee4c1059e61ff7aac3a2561 Mon Sep 17 00:00:00 2001 From: Florian Pallas Date: Mon, 16 Feb 2026 05:55:20 +0100 Subject: [PATCH] fix: correct malformed `CreateTeamOption` example (#11093) The example was not a valid map, which caused issues with some openapi yaml converters. I gave the two options proper values and also added them to the other team structs so the examples are identical. Also sorted them as they are enumerated in the [unit model definition](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/models/unit/unit.go), which is why the diff is a bit ugly. Fixes #9881 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11093 Reviewed-by: Gusted Co-authored-by: Florian Pallas Co-committed-by: Florian Pallas --- modules/structs/org_team.go | 6 +++--- templates/swagger/v1_json.tmpl | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/modules/structs/org_team.go b/modules/structs/org_team.go index a51dcf1d19..fd83a75739 100644 --- a/modules/structs/org_team.go +++ b/modules/structs/org_team.go @@ -17,7 +17,7 @@ type Team struct { // // Deprecated: This variable should be replaced by UnitsMap and will be dropped in later versions. Units []string `json:"units"` - // example: {"repo.code":"read","repo.issues":"write","repo.ext_issues":"none","repo.wiki":"admin","repo.pulls":"owner","repo.releases":"none","repo.projects":"none","repo.ext_wiki":"none"} + // example: {"repo.code":"read","repo.issues":"write","repo.ext_issues":"none","repo.pulls":"owner","repo.releases":"none","repo.wiki":"admin","repo.ext_wiki":"none","repo.projects":"none","repo.packages":"none","repo.actions":"none"} UnitsMap map[string]string `json:"units_map"` CanCreateOrgRepo bool `json:"can_create_org_repo"` } @@ -34,7 +34,7 @@ type CreateTeamOption struct { // // Deprecated: This variable should be replaced by UnitsMap and will be dropped in later versions. Units []string `json:"units"` - // example: {"repo.actions","repo.packages","repo.code":"read","repo.issues":"write","repo.ext_issues":"none","repo.wiki":"admin","repo.pulls":"owner","repo.releases":"none","repo.projects":"none","repo.ext_wiki":"none"} + // example: {"repo.code":"read","repo.issues":"write","repo.ext_issues":"none","repo.pulls":"owner","repo.releases":"none","repo.wiki":"admin","repo.ext_wiki":"none","repo.projects":"none","repo.packages":"none","repo.actions":"none"} UnitsMap map[string]string `json:"units_map"` CanCreateOrgRepo bool `json:"can_create_org_repo"` } @@ -51,7 +51,7 @@ type EditTeamOption struct { // // Deprecated: This variable should be replaced by UnitsMap and will be dropped in later versions. Units []string `json:"units"` - // example: {"repo.code":"read","repo.issues":"write","repo.ext_issues":"none","repo.wiki":"admin","repo.pulls":"owner","repo.releases":"none","repo.projects":"none","repo.ext_wiki":"none"} + // example: {"repo.code":"read","repo.issues":"write","repo.ext_issues":"none","repo.pulls":"owner","repo.releases":"none","repo.wiki":"admin","repo.ext_wiki":"none","repo.projects":"none","repo.packages":"none","repo.actions":"none"} UnitsMap map[string]string `json:"units_map"` CanCreateOrgRepo *bool `json:"can_create_org_repo"` } diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index da3b14da92..a82fa503f0 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -24540,7 +24540,18 @@ "type": "string" }, "x-go-name": "UnitsMap", - "example": "{\"repo.actions\",\"repo.packages\",\"repo.code\":\"read\",\"repo.issues\":\"write\",\"repo.ext_issues\":\"none\",\"repo.wiki\":\"admin\",\"repo.pulls\":\"owner\",\"repo.releases\":\"none\",\"repo.projects\":\"none\",\"repo.ext_wiki\":\"none\"}" + "example": { + "repo.actions": "none", + "repo.code": "read", + "repo.ext_issues": "none", + "repo.ext_wiki": "none", + "repo.issues": "write", + "repo.packages": "none", + "repo.projects": "none", + "repo.pulls": "owner", + "repo.releases": "none", + "repo.wiki": "admin" + } } }, "x-go-package": "forgejo.org/modules/structs" @@ -25608,10 +25619,12 @@ }, "x-go-name": "UnitsMap", "example": { + "repo.actions": "none", "repo.code": "read", "repo.ext_issues": "none", "repo.ext_wiki": "none", "repo.issues": "write", + "repo.packages": "none", "repo.projects": "none", "repo.pulls": "owner", "repo.releases": "none", @@ -29350,10 +29363,12 @@ }, "x-go-name": "UnitsMap", "example": { + "repo.actions": "none", "repo.code": "read", "repo.ext_issues": "none", "repo.ext_wiki": "none", "repo.issues": "write", + "repo.packages": "none", "repo.projects": "none", "repo.pulls": "owner", "repo.releases": "none",