From b02607c277cc07a0aea182736df20dd0cc16b994 Mon Sep 17 00:00:00 2001 From: Enrico Ferro Date: Wed, 22 Aug 2018 15:03:22 +0200 Subject: [PATCH 1/3] Fix API /admin/users/{username} (issue #4765) --- routers/api/v1/admin/user.go | 3 +++ templates/swagger/v1_json.tmpl | 6 +++++- vendor/code.gitea.io/sdk/gitea/admin_user.go | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 69e1761b09e6c..212ebac9c44ec 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -154,6 +154,9 @@ func EditUser(ctx *context.APIContext, form api.EditUserOption) { if form.MaxRepoCreation != nil { u.MaxRepoCreation = *form.MaxRepoCreation } + if form.AllowCreateOrganization != nil { + u.AllowCreateOrganization = *form.AllowCreateOrganization + } if err := models.UpdateUser(u); err != nil { if models.IsErrEmailAlreadyUsed(err) { diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 1ea79068ac685..7eb618d2b7998 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -6504,6 +6504,10 @@ "type": "boolean", "x-go-name": "AllowImportLocal" }, + "allow_create_organization": { + "type": "boolean", + "x-go-name": "AllowCreateOrganization" + }, "email": { "type": "string", "format": "email", @@ -8020,4 +8024,4 @@ "AuthorizationHeaderToken": [] } ] -} \ No newline at end of file +} diff --git a/vendor/code.gitea.io/sdk/gitea/admin_user.go b/vendor/code.gitea.io/sdk/gitea/admin_user.go index bc0f36994d3c3..c8f690db28322 100644 --- a/vendor/code.gitea.io/sdk/gitea/admin_user.go +++ b/vendor/code.gitea.io/sdk/gitea/admin_user.go @@ -51,6 +51,7 @@ type EditUserOption struct { AllowGitHook *bool `json:"allow_git_hook"` AllowImportLocal *bool `json:"allow_import_local"` MaxRepoCreation *int `json:"max_repo_creation"` + AllowCreateOrganization *bool `json:"allow_create_organization"` } // AdminEditUser modify user informations From 0db11885ee2f8253d1ec6f076ba8293152fcb2db Mon Sep 17 00:00:00 2001 From: Enrico Ferro Date: Thu, 23 Aug 2018 11:53:54 +0200 Subject: [PATCH 2/3] Fix API /admin/users/{username} v2 - Add prohibit_login (issue #4765) --- routers/api/v1/admin/user.go | 3 +++ templates/swagger/v1_json.tmpl | 4 ++++ vendor/code.gitea.io/sdk/gitea/admin_user.go | 1 + 3 files changed, 8 insertions(+) diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 212ebac9c44ec..958c083fb6f9e 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -157,6 +157,9 @@ func EditUser(ctx *context.APIContext, form api.EditUserOption) { if form.AllowCreateOrganization != nil { u.AllowCreateOrganization = *form.AllowCreateOrganization } + if form.ProhibitLogin != nil { + u.ProhibitLogin = *form.ProhibitLogin + } if err := models.UpdateUser(u); err != nil { if models.IsErrEmailAlreadyUsed(err) { diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 7eb618d2b7998..569e995af4aae 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -6534,6 +6534,10 @@ "type": "string", "x-go-name": "Password" }, + "prohibit_login": { + "type": "boolean", + "x-go-name": "ProhibitLogin" + }, "source_id": { "type": "integer", "format": "int64", diff --git a/vendor/code.gitea.io/sdk/gitea/admin_user.go b/vendor/code.gitea.io/sdk/gitea/admin_user.go index c8f690db28322..4eab8c255fdbd 100644 --- a/vendor/code.gitea.io/sdk/gitea/admin_user.go +++ b/vendor/code.gitea.io/sdk/gitea/admin_user.go @@ -51,6 +51,7 @@ type EditUserOption struct { AllowGitHook *bool `json:"allow_git_hook"` AllowImportLocal *bool `json:"allow_import_local"` MaxRepoCreation *int `json:"max_repo_creation"` + ProhibitLogin *bool `json:"prohibit_login"` AllowCreateOrganization *bool `json:"allow_create_organization"` } From 0b3ebdfd1001c3b8ff8390d8c01f6c6447391ca2 Mon Sep 17 00:00:00 2001 From: Enrico Ferro Date: Thu, 23 Aug 2018 14:55:36 +0200 Subject: [PATCH 3/3] fix from 'make generate-swagger' (issue #4765) --- templates/swagger/v1_json.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 569e995af4aae..598813bfc0047 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -6496,6 +6496,10 @@ "type": "boolean", "x-go-name": "Admin" }, + "allow_create_organization": { + "type": "boolean", + "x-go-name": "AllowCreateOrganization" + }, "allow_git_hook": { "type": "boolean", "x-go-name": "AllowGitHook" @@ -6504,10 +6508,6 @@ "type": "boolean", "x-go-name": "AllowImportLocal" }, - "allow_create_organization": { - "type": "boolean", - "x-go-name": "AllowCreateOrganization" - }, "email": { "type": "string", "format": "email", @@ -8028,4 +8028,4 @@ "AuthorizationHeaderToken": [] } ] -} +} \ No newline at end of file