From 0696d430c9baa409297dc06ffa0ab84c0ea44a29 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 24 Feb 2017 13:19:42 -0500 Subject: 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. --- routers/repo/setting.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'routers/repo/setting.go') 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 } -- cgit v1.2.3