do some changes follow go-gitea#10238 to add review requests num on l…

…ists also change icon for review requests to eye
a1012112796 · Apr 5, 2020 · 0813a58 · 0813a58
1 parent 3397d56
commit 0813a58
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 16 deletions.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -1106,6 +1106,8 @@ pulls.approve_count_1 = "%d approval"
 pulls.approve_count_n = "%d approvals"
 pulls.reject_count_1 = "%d change request"
 pulls.reject_count_n = "%d change requests"
+pulls.waiting_count_1 = "%d waiting review"
+pulls.waiting_count_n = "%d waiting reviews"
 
 pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled.
 pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually.

diff --git a/routers/repo/issue.go b/routers/repo/issue.go
@@ -289,6 +289,8 @@ func issues(ctx *context.Context, milestoneID int64, isPullOption util.OptionalB
 		reviewTyp := models.ReviewTypeApprove
 		if typ == "reject" {
 			reviewTyp = models.ReviewTypeReject
+		} else if typ == "waiting" {
+			reviewTyp = models.ReviewTypeRequest
 		}
 		for _, count := range counts {
 			if count.Type == reviewTyp {

diff --git a/routers/user/home.go b/routers/user/home.go
@@ -632,6 +632,8 @@ func Issues(ctx *context.Context) {
 		reviewTyp := models.ReviewTypeApprove
 		if typ == "reject" {
 			reviewTyp = models.ReviewTypeReject
+		} else if typ == "waiting" {
+			reviewTyp = models.ReviewTypeRequest
 		}
 		for _, count := range counts {
 			if count.Type == reviewTyp {

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
@@ -271,14 +271,25 @@
 						{{if .IsPull}}
 							{{$approveOfficial := call $approvalCounts .ID "approve"}}
 							{{$rejectOfficial := call $approvalCounts .ID "reject"}}
-							{{if or (gt $approveOfficial 0) (gt $rejectOfficial 0)}}
+							{{$waitingOfficial := call $approvalCounts .ID "waiting"}}
+							{{if gt $approveOfficial 0}}
 								<span class="approvals">{{svg "octicon-check" 16}}
 									{{$.i18n.Tr (TrN $.i18n.Lang $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n") $approveOfficial}}
-								{{if or (gt $rejectOfficial 0)}}
-									<span class="rejects">{{svg "octicon-x" 16}}
-										{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
-								{{end}}
+								</span>
 							{{end}}
+
+							{{if gt $rejectOfficial 0}}
+								<span class="rejects">{{svg "octicon-request-changes" 16}}
+									{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
+								</span>
+							{{end}}
+
+							{{if gt $waitingOfficial 0}}
+								<span class="waiting">{{svg "octicon-eye" 16}}
+									{{$.i18n.Tr (TrN $.i18n.Lang $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n") $waitingOfficial}}
+								</span>
+							{{end}}
+
 							{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
 								<span class="conflicting">{{svg "octicon-mirror" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
 							{{end}}

diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
@@ -241,14 +241,25 @@
 						{{if .IsPull}}
 							{{$approveOfficial := call $approvalCounts .ID "approve"}}
 							{{$rejectOfficial := call $approvalCounts .ID "reject"}}
-							{{if or (gt $approveOfficial 0) (gt $rejectOfficial 0)}}
+							{{$waitingOfficial := call $approvalCounts .ID "waiting"}}
+							{{if gt $approveOfficial 0}}
 								<span class="approvals">{{svg "octicon-check" 16}}
 									{{$.i18n.Tr (TrN $.i18n.Lang $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n") $approveOfficial}}
-								{{if or (gt $rejectOfficial 0)}}
-									<span class="rejects">{{svg "octicon-x" 16}}
-										{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
-								{{end}}
+								</span>
 							{{end}}
+
+							{{if gt $rejectOfficial 0}}
+								<span class="rejects">{{svg "octicon-request-changes" 16}}
+									{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
+								</span>
+							{{end}}
+
+							{{if gt $waitingOfficial 0}}
+								<span class="waiting">{{svg "octicon-eye" 16}}
+									{{$.i18n.Tr (TrN $.i18n.Lang $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n") $waitingOfficial}}
+								</span>
+							{{end}}
+
 							{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
 								<span class="conflicting">{{svg "octicon-mirror" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
 							{{end}}

diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
@@ -470,7 +470,7 @@
 		</div>
 	{{else if eq .Type 27}}
 		<div class="event" id="{{.HashTag}}">
-			{{svg "octicon-primitive-dot" 16}}
+			<span class="issue-symbol">{{svg "octicon-eye" 16}}</span>
 			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
 				<img src="{{.Poster.RelAvatarLink}}">
 			</a>

diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
@@ -173,14 +173,25 @@
 								{{if .IsPull}}
 									{{$approveOfficial := call $approvalCounts .ID "approve"}}
 									{{$rejectOfficial := call $approvalCounts .ID "reject"}}
-									{{if or (gt $approveOfficial 0) (gt $rejectOfficial 0) }}
+									{{$waitingOfficial := call $approvalCounts .ID "waiting"}}
+									{{if gt $approveOfficial 0}}
 										<span class="approvals">{{svg "octicon-check" 16}}
 											{{$.i18n.Tr (TrN $.i18n.Lang $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n") $approveOfficial}}
-										{{if or (gt $rejectOfficial 0)}}
-											<span class="rejects">{{svg "octicon-x" 16}}
-												{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
-										{{end}}
+										</span>
+									{{end}}
+
+									{{if gt $rejectOfficial 0}}
+										<span class="rejects">{{svg "octicon-request-changes" 16}}
+											{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
+										</span>
 									{{end}}
+
+									{{if gt $waitingOfficial 0}}
+										<span class="waiting">{{svg "octicon-eye" 16}}
+											{{$.i18n.Tr (TrN $.i18n.Lang $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n") $waitingOfficial}}
+										</span>
+									{{end}}
+
 									{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
 										<span class="conflicting">{{svg "octicon-mirror" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
 									{{end}}