From 954fe0e4e0ab61516f200a171cf9a3bfb49c8906 Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Mon, 26 Aug 2019 20:13:10 +0200 Subject: [PATCH] swagger/fix: []string are not enum by swagger definition (#7916) * []string are not enum by swagger definition * apply suggestion of @guillep2k * re-generate swagger file --- modules/structs/org_team.go | 6 +++--- templates/swagger/v1_json.tmpl | 36 +++++++++++++++++----------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/structs/org_team.go b/modules/structs/org_team.go index b8b5090225..bea4a10ad4 100644 --- a/modules/structs/org_team.go +++ b/modules/structs/org_team.go @@ -13,7 +13,7 @@ type Team struct { Organization *Organization `json:"organization"` // enum: none,read,write,admin,owner Permission string `json:"permission"` - // enum: repo.code,repo.issues,repo.ext_issues,repo.wiki,repo.pulls,repo.releases,repo.ext_wiki + // example: ["repo.code","repo.issues","repo.ext_issues","repo.wiki","repo.pulls","repo.releases","repo.ext_wiki"] Units []string `json:"units"` } @@ -24,7 +24,7 @@ type CreateTeamOption struct { Description string `json:"description" binding:"MaxSize(255)"` // enum: read,write,admin Permission string `json:"permission"` - // enum: repo.code,repo.issues,repo.ext_issues,repo.wiki,repo.pulls,repo.releases,repo.ext_wiki + // example: ["repo.code","repo.issues","repo.ext_issues","repo.wiki","repo.pulls","repo.releases","repo.ext_wiki"] Units []string `json:"units"` } @@ -35,6 +35,6 @@ type EditTeamOption struct { Description string `json:"description" binding:"MaxSize(255)"` // enum: read,write,admin Permission string `json:"permission"` - // enum: repo.code,repo.issues,repo.ext_issues,repo.wiki,repo.pulls,repo.releases,repo.ext_wiki + // example: ["repo.code","repo.issues","repo.ext_issues","repo.wiki","repo.pulls","repo.releases","repo.ext_wiki"] Units []string `json:"units"` } diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index de670156de..2e4af809e8 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -7742,7 +7742,11 @@ }, "units": { "type": "array", - "enum": [ + "items": { + "type": "string" + }, + "x-go-name": "Units", + "example": [ "repo.code", "repo.issues", "repo.ext_issues", @@ -7750,11 +7754,7 @@ "repo.pulls", "repo.releases", "repo.ext_wiki" - ], - "items": { - "type": "string" - }, - "x-go-name": "Units" + ] } }, "x-go-package": "code.gitea.io/gitea/modules/structs" @@ -8276,7 +8276,11 @@ }, "units": { "type": "array", - "enum": [ + "items": { + "type": "string" + }, + "x-go-name": "Units", + "example": [ "repo.code", "repo.issues", "repo.ext_issues", @@ -8284,11 +8288,7 @@ "repo.pulls", "repo.releases", "repo.ext_wiki" - ], - "items": { - "type": "string" - }, - "x-go-name": "Units" + ] } }, "x-go-package": "code.gitea.io/gitea/modules/structs" @@ -9827,7 +9827,11 @@ }, "units": { "type": "array", - "enum": [ + "items": { + "type": "string" + }, + "x-go-name": "Units", + "example": [ "repo.code", "repo.issues", "repo.ext_issues", @@ -9835,11 +9839,7 @@ "repo.pulls", "repo.releases", "repo.ext_wiki" - ], - "items": { - "type": "string" - }, - "x-go-name": "Units" + ] } }, "x-go-package": "code.gitea.io/gitea/modules/structs"