mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
Don't show new pr button when page is not compare pull (#26431)
Before:  After:  (TestOrg:test is a tag not branch) Problem: In the template, we will not add `compare pull` class when `PageIsComparePull` is false.a370efc13f/templates/repo/diff/compare.tmpl (L2)
But in the js, we are using `.repository.compare.pull` to find the button:a370efc13f/web_src/js/features/repo-legacy.js (L552-L563)
So, if `PageIsComparePull` is false, the `New Pull Request` button will be there, but has no response when we click it.
This commit is contained in:
@@ -177,7 +177,7 @@
|
||||
</div>
|
||||
|
||||
{{if .IsNothingToCompare}}
|
||||
{{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived)}}
|
||||
{{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived) .PageIsComparePull}}
|
||||
<div class="ui segment">{{ctx.Locale.Tr "repo.pulls.nothing_to_compare_and_allow_empty_pr"}}</div>
|
||||
<div class="ui info message show-form-container {{if .Flash}}gt-hidden{{end}}">
|
||||
<button class="ui button primary show-form">{{ctx.Locale.Tr "repo.pulls.new"}}</button>
|
||||
@@ -185,8 +185,10 @@
|
||||
<div class="pullrequest-form {{if not .Flash}}gt-hidden{{end}}">
|
||||
{{template "repo/issue/new_form" .}}
|
||||
</div>
|
||||
{{else}}
|
||||
{{else if and .HeadIsBranch .BaseIsBranch}}
|
||||
<div class="ui segment">{{ctx.Locale.Tr "repo.pulls.nothing_to_compare"}}</div>
|
||||
{{else}}
|
||||
<div class="ui segment">{{ctx.Locale.Tr "repo.pulls.nothing_to_compare_have_tag"}}</div>
|
||||
{{end}}
|
||||
{{else if and .PageIsComparePull (gt .CommitCount 0)}}
|
||||
{{if .HasPullRequest}}
|
||||
@@ -229,7 +231,7 @@
|
||||
{{end}}
|
||||
{{$showDiffBox = true}}
|
||||
{{end}}
|
||||
{{else}}
|
||||
{{else if not .IsNothingToCompare}}
|
||||
{{$showDiffBox = true}}
|
||||
{{end}}
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user