From b613d70b419cb1464711e13aff7c651d4693f4dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=99=BA=E8=B6=85?= <1012112796@qq.com> Date: Sun, 6 Sep 2020 23:00:16 +0800 Subject: [PATCH] ui: Show git-pull-request icon for closed pull request (#12742) As title, I think it's more reasonable, and it's the same as GH. Signed-off-by: a1012112796 <1012112796@qq.com> --- templates/repo/branch/list.tmpl | 4 ++-- templates/repo/issue/view_title.tmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index d2eedef49c..74025bd530 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -95,9 +95,9 @@ {{if .LatestPullRequest.HasMerged}} {{svg "octicon-git-merge" 16}} {{$.i18n.Tr "repo.pulls.merged"}} {{else if .LatestPullRequest.Issue.IsClosed}} - {{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.issues.closed_title"}} + {{svg "octicon-git-pull-request" 16}} {{$.i18n.Tr "repo.issues.closed_title"}} {{else}} - {{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.open_title"}} + {{svg "octicon-git-pull-request" 16}} {{$.i18n.Tr "repo.issues.open_title"}} {{end}} {{end}} diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 459c44e78d..ea63dd0737 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -19,7 +19,7 @@ {{if .HasMerged}}
{{svg "octicon-git-merge" 16}} {{.i18n.Tr "repo.pulls.merged"}}
{{else if .Issue.IsClosed}} -
{{svg "octicon-issue-closed" 16}} {{.i18n.Tr "repo.issues.closed_title"}}
+
{{if .Issue.IsPull}}{{svg "octicon-git-pull-request" 16}}{{else}}{{svg "octicon-issue-closed" 16}}{{end}} {{.i18n.Tr "repo.issues.closed_title"}}
{{else if .Issue.IsPull}}
{{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "repo.issues.open_title"}}
{{else}}