diff options
Diffstat (limited to 'routers/api/v1/org')
| -rw-r--r-- | routers/api/v1/org/member.go | 7 | ||||
| -rw-r--r-- | routers/api/v1/org/org.go | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/routers/api/v1/org/member.go b/routers/api/v1/org/member.go index 4530349f2c..d818321790 100644 --- a/routers/api/v1/org/member.go +++ b/routers/api/v1/org/member.go @@ -190,7 +190,12 @@ func IsPublicMember(ctx *context.APIContext) { if ctx.Written() { return } - if userToCheck.IsPublicMember(ctx.Org.Organization.ID) { + is, err := models.IsPublicMembership(ctx.Org.Organization.ID, userToCheck.ID) + if err != nil { + ctx.Error(http.StatusInternalServerError, "IsPublicMembership", err) + return + } + if is { ctx.Status(http.StatusNoContent) } else { ctx.NotFound() diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index f539662d62..952e29fba9 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -9,6 +9,7 @@ import ( "net/http" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/convert" api "code.gitea.io/gitea/modules/structs" @@ -343,7 +344,7 @@ func Edit(ctx *context.APIContext) { if form.RepoAdminChangeTeamAccess != nil { org.RepoAdminChangeTeamAccess = *form.RepoAdminChangeTeamAccess } - if err := models.UpdateUserCols(org.AsUser(), + if err := models.UpdateUserCols(db.DefaultContext, org.AsUser(), "full_name", "description", "website", "location", "visibility", "repo_admin_change_team_access", ); err != nil { |