Merge branch 'main' into fix-20621-no-err-in-IsUserAllowedToUpdate

lafriks · web-flow · commit c0192bbe1668 · 2022-08-18T11:58:42.000+03:00
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ func EditTeam(ctx *context.APIContext) {`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`if form.CanCreateOrgRepo != nil {`
`265`		`- team.CanCreateOrgRepo = *form.CanCreateOrgRepo`
	`265`	`+ team.CanCreateOrgRepo = team.IsOwnerTeam() \|\| *form.CanCreateOrgRepo`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`if len(form.Name) > 0 {`
Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,11 @@ func EditTeamPost(ctx *context.Context) {`
`416`	`416`	`isIncludeAllChanged = true`
`417`	`417`	`t.IncludesAllRepositories = includesAllRepositories`
`418`	`418`	`}`
	`419`	`+ t.CanCreateOrgRepo = form.CanCreateOrgRepo`
	`420`	`+ } else {`
	`421`	`+ t.CanCreateOrgRepo = true`
`419`	`422`	`}`
	`423`	`+`
`420`	`424`	`t.Description = form.Description`
`421`	`425`	`if t.AccessMode < perm.AccessModeAdmin {`
`422`	`426`	`units := make([]organization.TeamUnit, 0, len(unitPerms))`
`@@ -433,7 +437,6 @@ func EditTeamPost(ctx *context.Context) {`
`433`	`437`	`return`
`434`	`438`	`}`
`435`	`439`	`}`
`436`		`- t.CanCreateOrgRepo = form.CanCreateOrgRepo`
`437`	`440`
`438`	`441`	`if ctx.HasError() {`
`439`	`442`	`ctx.HTML(http.StatusOK, tplTeamNew)`