Simplifying conditional expressions.

oscarcosta · Dec 8, 2019 · d723929 · d723929
1 parent 582d7ef
commit d723929
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
@@ -239,9 +239,9 @@
 						{{else}}
 							{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
 						{{end}}
-						{{if .IsPull }}{{if .PullRequest.RequiresApproval }}
+						{{if and .IsPull .PullRequest.RequiresApproval}}
 							<a class="milestone" href="{{$.Link}}/{{.Index}}">{{.PullRequest.GetReviewLabel $.i18n.Lang | Safe}}</a>
-						{{end}}{{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,9 +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 and .IsPull .PullRequest.RequiresApproval}}
+							<a class="milestone" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.PullRequest.GetReviewLabel $.i18n.Lang | Safe}}</a>
+						{{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,9 +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 and .IsPull .PullRequest.RequiresApproval}}
+									<a class="milestone" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/pulls/{{.Index}}">{{.PullRequest.GetReviewLabel $.i18n.Lang | Safe}}</a>
+								{{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}}