From 09bda24d63b4c5806f48c312bfca42c1a0a61c74 Mon Sep 17 00:00:00 2001
From: CodeDoctor <20452814+CodeDoctorDE@users.noreply.github.com>
Date: Mon, 22 Aug 2022 14:51:48 +0200
Subject: [PATCH] Improve single repo action for issue and pull requests
 (#20730)

Related to #20650.

This will fix the behavior of the single repo action for pull requests and disables the button for other screens that don't have a single repo action currently.
---
 routers/web/user/home.go             | 2 ++
 templates/user/dashboard/issues.tmpl | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/routers/web/user/home.go b/routers/web/user/home.go
index f28a684054a1..c4aa749ce2ae 100644
--- a/routers/web/user/home.go
+++ b/routers/web/user/home.go
@@ -301,6 +301,7 @@ func Pulls(ctx *context.Context) {
 
 	ctx.Data["Title"] = ctx.Tr("pull_requests")
 	ctx.Data["PageIsPulls"] = true
+	ctx.Data["SingleRepoAction"] = "pull"
 	buildIssueOverview(ctx, unit.TypePullRequests)
 }
 
@@ -314,6 +315,7 @@ func Issues(ctx *context.Context) {
 
 	ctx.Data["Title"] = ctx.Tr("issues")
 	ctx.Data["PageIsIssues"] = true
+	ctx.Data["SingleRepoAction"] = "issue"
 	buildIssueOverview(ctx, unit.TypeIssues)
 }
 
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index b6dc002154b6..666a7bdb2a1b 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -100,7 +100,11 @@
 							</div>
 						</div>
 						{{if .SingleRepoLink}}
-							<a class="ui green button" href="{{.SingleRepoLink}}/issues/new/choose">{{.locale.Tr "repo.issues.new"}}</a>
+							{{if eq .SingleRepoAction "issue"}}
+								<a class="ui green button" href="{{.SingleRepoLink}}/issues/new/choose">{{.locale.Tr "repo.issues.new"}}</a>
+							{{else if eq .SingleRepoAction "pull"}}
+								<a class="ui green button" href="{{.SingleRepoLink}}/compare">{{.locale.Tr "repo.pulls.new"}}</a>
+							{{end}}
 						{{end}}
 					</div>
 				</div>