diff options
| author | CodeDoctor <20452814+CodeDoctorDE@users.noreply.github.com> | 2022-08-22 14:51:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 13:51:48 +0100 |
| commit | aedfc923addcb7aa013f96474e942951e3fda74c (patch) | |
| tree | 97d993418d53be74dfce953e5580d94bd3171eaf | |
| parent | 353a5331d520a7299d922b670f6ccee0df8a345e (diff) | |
| download | gitea-aedfc923addcb7aa013f96474e942951e3fda74c.tar.gz gitea-aedfc923addcb7aa013f96474e942951e3fda74c.zip | |
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.
| -rw-r--r-- | routers/web/user/home.go | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/routers/web/user/home.go b/routers/web/user/home.go index f28a684054..c4aa749ce2 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 b6dc002154..666a7bdb2a 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> |