summaryrefslogtreecommitdiffstats
path: root/routers/api/v1/org/org.go
diff options
context:
space:
mode:
authorRichard Mahn <richmahn@users.noreply.github.com>2019-05-30 13:57:55 -0400
committertechknowlogick <techknowlogick@gitea.io>2019-05-30 13:57:55 -0400
commit43cf2f3b55de4a69183966da2a6e0167592c733c (patch)
treebdc943cdb6aabe6b48f5f3222ebb6587ae8cd70e /routers/api/v1/org/org.go
parentd95caf50ec9e34a652a0e51baf5037c8cf424a01 (diff)
downloadgitea-43cf2f3b55de4a69183966da2a6e0167592c733c.tar.gz
gitea-43cf2f3b55de4a69183966da2a6e0167592c733c.zip
Fixes #7023 - API Org Visibility (#7028)
Diffstat (limited to 'routers/api/v1/org/org.go')
-rw-r--r--routers/api/v1/org/org.go14
1 files changed, 12 insertions, 2 deletions
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
index e1d0663f05..2893887a4b 100644
--- a/routers/api/v1/org/org.go
+++ b/routers/api/v1/org/org.go
@@ -90,6 +90,11 @@ func Create(ctx *context.APIContext, form api.CreateOrgOption) {
return
}
+ visibility := api.VisibleTypePublic
+ if form.Visibility != "" {
+ visibility = api.VisibilityModes[form.Visibility]
+ }
+
org := &models.User{
Name: form.UserName,
FullName: form.FullName,
@@ -98,6 +103,7 @@ func Create(ctx *context.APIContext, form api.CreateOrgOption) {
Location: form.Location,
IsActive: true,
Type: models.UserTypeOrganization,
+ Visibility: visibility,
}
if err := models.CreateOrganization(org, ctx.User); err != nil {
if models.IsErrUserAlreadyExist(err) ||
@@ -153,6 +159,7 @@ func Edit(ctx *context.APIContext, form api.EditOrgOption) {
// required: true
// - name: body
// in: body
+ // required: true
// schema:
// "$ref": "#/definitions/EditOrgOption"
// responses:
@@ -163,8 +170,11 @@ func Edit(ctx *context.APIContext, form api.EditOrgOption) {
org.Description = form.Description
org.Website = form.Website
org.Location = form.Location
- if err := models.UpdateUserCols(org, "full_name", "description", "website", "location"); err != nil {
- ctx.Error(500, "UpdateUser", err)
+ if form.Visibility != "" {
+ org.Visibility = api.VisibilityModes[form.Visibility]
+ }
+ if err := models.UpdateUserCols(org, "full_name", "description", "website", "location", "visibility"); err != nil {
+ ctx.Error(500, "EditOrganization", err)
return
}