Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Fix owners cannot create organization repos bug (#20841) (#20854)

Browse source 
Backport #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: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Gusted <williamzijl7@hotmail.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
This commit is contained in:
zeripath 2022-08-18 19:54:48 +01:00 committed by GitHub
parent 737486152c
commit 35ca651c80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routers/api/v1/org/team.go
View file

@ -262,7 +262,7 @@ func EditTeam(ctx *context.APIContext) {
} }
if form.CanCreateOrgRepo != nil { if form.CanCreateOrgRepo != nil {
team.CanCreateOrgRepo = *form.CanCreateOrgRepo team.CanCreateOrgRepo = team.IsOwnerTeam() || *form.CanCreateOrgRepo
} }
if len(form.Name) > 0 { if len(form.Name) > 0 {

5
routers/web/org/teams.go
View file

@ -416,7 +416,11 @@ func EditTeamPost(ctx *context.Context) {
isIncludeAllChanged = true isIncludeAllChanged = true
t.IncludesAllRepositories = includesAllRepositories t.IncludesAllRepositories = includesAllRepositories
} }
t.CanCreateOrgRepo = form.CanCreateOrgRepo
} else {
t.CanCreateOrgRepo = true
} }
t.Description = form.Description t.Description = form.Description
if t.AccessMode < perm.AccessModeAdmin { if t.AccessMode < perm.AccessModeAdmin {
units := make([]organization.TeamUnit, 0, len(unitPerms)) units := make([]organization.TeamUnit, 0, len(unitPerms))
@ -433,7 +437,6 @@ func EditTeamPost(ctx *context.Context) {
return return
} }
} }
t.CanCreateOrgRepo = form.CanCreateOrgRepo
if ctx.HasError() { if ctx.HasError() {
ctx.HTML(http.StatusOK, tplTeamNew) ctx.HTML(http.StatusOK, tplTeamNew)