From b1f3685015246d3458f6d8c1d892eab076b3ed4a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 12 Dec 2018 07:49:33 +0800 Subject: fix approvals limitation (#5521) --- routers/repo/issue.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'routers/repo/issue.go') diff --git a/routers/repo/issue.go b/routers/repo/issue.go index c04cc27746..e0fb4ac52f 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -776,6 +776,7 @@ func ViewIssue(ctx *context.Context) { if issue.IsPull { pull := issue.PullRequest + pull.Issue = issue canDelete := false if ctx.IsSigned { @@ -833,8 +834,9 @@ func ViewIssue(ctx *context.Context) { return } if pull.ProtectedBranch != nil { - ctx.Data["IsBlockedByApprovals"] = !pull.ProtectedBranch.HasEnoughApprovals(pull) - ctx.Data["GrantedApprovals"] = pull.ProtectedBranch.GetGrantedApprovalsCount(pull) + cnt := pull.ProtectedBranch.GetGrantedApprovalsCount(pull) + ctx.Data["IsBlockedByApprovals"] = pull.ProtectedBranch.RequiredApprovals > 0 && cnt < pull.ProtectedBranch.RequiredApprovals + ctx.Data["GrantedApprovals"] = cnt } ctx.Data["IsPullBranchDeletable"] = canDelete && pull.HeadRepo != nil && git.IsBranchExist(pull.HeadRepo.RepoPath(), pull.HeadBranch) -- cgit v1.2.3