Skip to content

Fix owners cannot create organization repos bug #20841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lafriks merged 5 commits into from
Aug 18, 2022
Merged

Fix owners cannot create organization repos bug #20841

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee63dd8
Fix owners cannot create organization repos bug
lunny Aug 18, 2022
79e59df
Fix api
lunny Aug 18, 2022
e586cd5
Update routers/api/v1/org/team.go
lunny Aug 18, 2022
391a00b
Merge branch 'main' into lunny/fix_owners_create_bug
lunny Aug 18, 2022
4547a6f
Merge branch 'main' into lunny/fix_owners_create_bug
lunny Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion routers/api/v1/org/team.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,11 @@ func EditTeam(ctx *context.APIContext) {
}

if form.CanCreateOrgRepo != nil {
team.CanCreateOrgRepo = *form.CanCreateOrgRepo
if team.IsOwnerTeam() {
team.CanCreateOrgRepo = true
} else {
team.CanCreateOrgRepo = *form.CanCreateOrgRepo
}
Comment thread
lunny marked this conversation as resolved.
Outdated
}

if len(form.Name) > 0 {
Expand Down
5 changes: 4 additions & 1 deletion routers/web/org/teams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,11 @@ func EditTeamPost(ctx *context.Context) {
isIncludeAllChanged = true
t.IncludesAllRepositories = includesAllRepositories
}
t.CanCreateOrgRepo = form.CanCreateOrgRepo
} else {
t.CanCreateOrgRepo = true
Comment on lines +419 to +421
Copy link
Copy Markdown
Member

@delvh delvh Aug 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively, to save a line, you can do

t.CanCreateOrgRepo = t.IsOwnerTeam()
if !t.CanCreateOrgRepo {
...
t.CanCreateOrgRepo = form.CanCreateOrgRepo

above

}

t.Description = form.Description
if t.AccessMode < perm.AccessModeAdmin {
units := make([]organization.TeamUnit, 0, len(unitPerms))
Expand All @@ -433,7 +437,6 @@ func EditTeamPost(ctx *context.Context) {
return
}
}
t.CanCreateOrgRepo = form.CanCreateOrgRepo

if ctx.HasError() {
ctx.HTML(http.StatusOK, tplTeamNew)
Expand Down