go-gitea · oscarcosta · Dec 7, 2019 · Dec 7, 2019 · Dec 7, 2019 · Dec 7, 2019
diff --git a/models/branches.go b/models/branches.go
@@ -165,6 +165,20 @@ func (protectBranch *ProtectedBranch) GetGrantedApprovalsCount(pr *PullRequest)
 	return approvals
 }
 
+// GetRejectedReviewsCount returns the number of rejected reviews for pr.
+func (protectBranch *ProtectedBranch) GetRejectedReviewsCount(pr *PullRequest) int64 {
+	rejects, err := x.Where("issue_id = ?", pr.Issue.ID).
+		And("type = ?", ReviewTypeReject).
+		And("official = ?", true).
+		Count(new(Review))
+	if err != nil {
+		log.Error("GetRejectedReviewsCount: %v", err)
+		return 0
+	}
+
+	return rejects
+}
+
 // GetProtectedBranchByRepoID getting protected branch by repo ID
 func GetProtectedBranchByRepoID(repoID int64) ([]*ProtectedBranch, error) {
 	protectedBranches := make([]*ProtectedBranch, 0)

diff --git a/models/issue.go b/models/issue.go
@@ -180,6 +180,9 @@ func (issue *Issue) loadPullRequest(e Engine) (err error) {
 		}
 		issue.PullRequest.Issue = issue
 	}
+	if issue.PullRequest != nil && issue.PullRequest.Issue == nil {
+		issue.PullRequest.Issue = issue
+	}
 	return nil
 }
 

diff --git a/models/pull.go b/models/pull.go
@@ -24,6 +24,7 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 
 	"github.com/unknwon/com"
+	"github.com/unknwon/i18n"
 )
 
 var pullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
@@ -176,6 +177,39 @@ func (pr *PullRequest) loadProtectedBranch(e Engine) (err error) {
 	return
 }
 
+func (pr *PullRequest) requiredApprovals() int64 {
+	if pr.ProtectedBranch == nil {
+		if err := pr.loadProtectedBranch(x); err != nil {
+			log.Error("Error loading ProtectedBranch", err)
+		}
+	}
+	if pr.ProtectedBranch != nil {
+		return pr.ProtectedBranch.RequiredApprovals
+	}
+	return 0
+}
+
+// RequiresApproval returns true if this pull request requires approval, otherwise returns false
+func (pr *PullRequest) RequiresApproval() bool {
+	return pr.requiredApprovals() > 0
+}
+
+// GetReviewLabel returns the formatted review label with counter for the review of this pull request
+func (pr *PullRequest) GetReviewLabel(lang string) string {
+	if pr.RequiresApproval() {
+		rejections := pr.ProtectedBranch.GetRejectedReviewsCount(pr)
+		if pr.ProtectedBranch.GetRejectedReviewsCount(pr) > 0 {
+			return i18n.Tr(lang, "repo.pulls.review_rejected", rejections)
+		}
+		approvals := pr.ProtectedBranch.GetGrantedApprovalsCount(pr)
+		if approvals >= pr.ProtectedBranch.RequiredApprovals {
+			return i18n.Tr(lang, "repo.pulls.review_approved", approvals)
+		}
+		return i18n.Tr(lang, "repo.pulls.review_required", pr.ProtectedBranch.RequiredApprovals-approvals)
+	}
+	return i18n.Tr(lang, "repo.pulls.review_approved", 0) // by default
+}
+
 // GetDefaultMergeMessage returns default message used when merging pull request
 func (pr *PullRequest) GetDefaultMergeMessage() string {
 	if pr.HeadRepo == nil {

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -1070,6 +1070,9 @@ pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because
 pulls.status_checking = Some checks are pending
 pulls.status_checks_success = All checks were successful
 pulls.status_checks_error = Some checks failed
+pulls.review_required = Review required <span class="ui white small label">%d</span>
+pulls.review_approved = Approved <span class="ui white small label">%d</span>
+pulls.review_rejected = Changes requested <span class="ui white small label">%d</span>
 
 milestones.new = New Milestone
 milestones.open_tab = %d Open

diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -1041,6 +1041,9 @@ pulls.open_unmerged_pull_exists=`No puede realizar la reapertura porque hay un p
 pulls.status_checking=Algunas comprobaciones están pendientes
 pulls.status_checks_success=Todas las comprobaciones han sido exitosas
 pulls.status_checks_error=Algunas comprobaciones han fallado
+pulls.review_required = Revisión requerida <span class="ui white small label">%d</span>
+pulls.review_approved = Aprobada <span class="ui white small label">%d</span>
+pulls.review_rejected = Cambios solicitados <span class="ui white small label">%d</span>
 
 milestones.new=Nuevo hito
 milestones.open_tab=%d abiertas

diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -1069,6 +1069,9 @@ pulls.open_unmerged_pull_exists=`Não é possível executar uma operação de re
 pulls.status_checking=Algumas verificações estão pendentes
 pulls.status_checks_success=Todas as verificações foram bem sucedidas
 pulls.status_checks_error=Algumas verificações falharam
+pulls.review_required = Revisão requerida <span class="ui white small label">%d</span>
+pulls.review_approved = Aprovado <span class="ui white small label">%d</span>
+pulls.review_rejected = Alterações solicitadas <span class="ui white small label">%d</span>
 
 milestones.new=Novo marco
 milestones.open_tab=%d Aberto

diff --git a/routers/user/home.go b/routers/user/home.go
@@ -335,6 +335,10 @@ func Issues(ctx *context.Context) {
 		issue.Repo = showReposMap[issue.RepoID]
 
 		if isPullList {
+			if err := issue.LoadPullRequest(); err != nil {
+				ctx.ServerError("LoadPullRequest", err)
+				return
+			}
 			commitStatus[issue.PullRequest.ID], _ = issue.PullRequest.GetLastCommitStatus()
 		}
 	}

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
@@ -239,7 +239,9 @@
 						{{else}}
 							{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
 						{{end}}
-
+						{{if .IsPull }}{{if .PullRequest.RequiresApproval }}
+							<a class="milestone" href="{{$.Link}}/{{.Index}}">{{.PullRequest.GetReviewLabel $.i18n.Lang | Safe}}</a>
+						{{end}}{{end}}
 						{{if .Milestone}}
 							<a class="milestone" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.Milestone.ID}}&assignee={{$.AssigneeID}}">
 								<span class="octicon octicon-milestone"></span> {{.Milestone.Name}}

diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
@@ -206,6 +206,9 @@
 						{{else}}
 							{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName|Escape) | Safe}}
 						{{end}}
+						{{if .IsPull }}{{if .PullRequest.RequiresApproval }}
+							<a class="milestone" href="{{$.RepoLink}}/issues/{{.Index}}">{{.PullRequest.GetReviewLabel $.i18n.Lang | Safe}}</a>
+						{{end}}{{end}}
 						{{if .Ref}}
 							<a class="ref" href="{{$.RepoLink}}/src/branch/{{.Ref}}">
 								<span class="octicon octicon-git-branch"></span> {{.Ref}}

diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
@@ -124,6 +124,9 @@
 								{{else}}
 									{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName|Escape) | Safe}}
 								{{end}}
+								{{if .IsPull }}{{if .PullRequest.RequiresApproval }}
+									<a class="milestone" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.PullRequest.GetReviewLabel $.i18n.Lang | Safe}}</a>
+								{{end}}{{end}}
 								{{if .Milestone}}
 									<a class="milestone" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.Milestone.ID}}&assignee={{$.AssigneeID}}">
 										<span class="octicon octicon-milestone"></span> {{.Milestone.Name}}