aboutsummaryrefslogtreecommitdiff
path: root/routers/repo/setting.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-02-24 13:19:42 -0500
committerUnknwon <u@gogs.io>2017-02-24 13:19:42 -0500
commit0696d430c9baa409297dc06ffa0ab84c0ea44a29 (patch)
tree7fac3c1319c28af84a9a534dbe86f9fed920b441 /routers/repo/setting.go
parent68b231bd89ab4bf2061a4f83dba67e3e901f2e45 (diff)
protect_branch: only list teams have write access
List teams without write access to the repository cause confusion to make users think members of team could push to the branch.
Diffstat (limited to 'routers/repo/setting.go')
-rw-r--r--routers/repo/setting.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index eb8048c5..7cafe3e3 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -438,11 +438,12 @@ func SettingsProtectedBranch(ctx *context.Context) {
ctx.Data["Users"] = users
ctx.Data["whitelist_users"] = protectBranch.WhitelistUserIDs
- if err = ctx.Repo.Owner.GetTeams(); err != nil {
- ctx.Handle(500, "Repo.Owner.GetTeams", err)
+ teams, err := ctx.Repo.Owner.TeamsHaveAccessToRepo(ctx.Repo.Repository.ID, models.ACCESS_MODE_WRITE)
+ if err != nil {
+ ctx.Handle(500, "Repo.Owner.TeamsHaveAccessToRepo", err)
return
}
- ctx.Data["Teams"] = ctx.Repo.Owner.Teams
+ ctx.Data["Teams"] = teams
ctx.Data["whitelist_teams"] = protectBranch.WhitelistTeamIDs
}