diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-08-18 16:58:21 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-18 11:58:21 +0300 |
commit | 999392f6a5cfa450148cbcb42a17d3f7dcfd1ec7 (patch) | |
tree | f26effdf19a7718ad55a74a07252e717989aa0fa | |
parent | 5d0f643461fd40d8b04a35295e21dc459f398741 (diff) | |
download | gitea-999392f6a5cfa450148cbcb42a17d3f7dcfd1ec7.tar.gz gitea-999392f6a5cfa450148cbcb42a17d3f7dcfd1ec7.zip |
Fix owners cannot create organization repos bug (#20841)
* Fix owners cannot create organization repos bug
* Fix api
* Update routers/api/v1/org/team.go
Co-authored-by: Gusted <williamzijl7@hotmail.com>
Co-authored-by: Gusted <williamzijl7@hotmail.com>
-rw-r--r-- | routers/api/v1/org/team.go | 2 | ||||
-rw-r--r-- | routers/web/org/teams.go | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go index f8c37303d6..db37bac57e 100644 --- a/routers/api/v1/org/team.go +++ b/routers/api/v1/org/team.go @@ -262,7 +262,7 @@ func EditTeam(ctx *context.APIContext) { } if form.CanCreateOrgRepo != nil { - team.CanCreateOrgRepo = *form.CanCreateOrgRepo + team.CanCreateOrgRepo = team.IsOwnerTeam() || *form.CanCreateOrgRepo } if len(form.Name) > 0 { diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index 284fb096f3..9ee66a1a3e 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -416,7 +416,11 @@ func EditTeamPost(ctx *context.Context) { isIncludeAllChanged = true t.IncludesAllRepositories = includesAllRepositories } + t.CanCreateOrgRepo = form.CanCreateOrgRepo + } else { + t.CanCreateOrgRepo = true } + t.Description = form.Description if t.AccessMode < perm.AccessModeAdmin { units := make([]organization.TeamUnit, 0, len(unitPerms)) @@ -433,7 +437,6 @@ func EditTeamPost(ctx *context.Context) { return } } - t.CanCreateOrgRepo = form.CanCreateOrgRepo if ctx.HasError() { ctx.HTML(http.StatusOK, tplTeamNew) |