core
/
gitea
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
CodeDoctor 2022-08-22 14:51:48 +02:00 committed by GitHub
parent 353a5331d5
commit aedfc923ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
routers/web/user/home.go
View File

@ -301,6 +301,7 @@ func Pulls(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("pull_requests") ctx.Data["Title"] = ctx.Tr("pull_requests")
ctx.Data["PageIsPulls"] = true ctx.Data["PageIsPulls"] = true
ctx.Data["SingleRepoAction"] = "pull"
buildIssueOverview(ctx, unit.TypePullRequests) buildIssueOverview(ctx, unit.TypePullRequests)
} }
@ -314,6 +315,7 @@ func Issues(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("issues") ctx.Data["Title"] = ctx.Tr("issues")
ctx.Data["PageIsIssues"] = true ctx.Data["PageIsIssues"] = true
ctx.Data["SingleRepoAction"] = "issue"
buildIssueOverview(ctx, unit.TypeIssues) buildIssueOverview(ctx, unit.TypeIssues)
} }

6
templates/user/dashboard/issues.tmpl
View File

@ -100,7 +100,11 @@
</div> </div>
</div> </div>
{{if .SingleRepoLink}} {{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}} {{end}}
</div> </div>
</div> </div>