aboutsummaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authoryp05327 <576951401@qq.com>2024-01-22 00:13:00 +0900
committerGitHub <noreply@github.com>2024-01-21 15:13:00 +0000
commitb693611b35c5ae17cfc820bc3e731608a5251464 (patch)
tree43c7529bb7f3778fb01482ed8d57a08a4952ee95 /options
parent5d09023f1354f7a62f2ff68731e62e3e3645f4f2 (diff)
downloadgitea-b693611b35c5ae17cfc820bc3e731608a5251464.tar.gz
gitea-b693611b35c5ae17cfc820bc3e731608a5251464.zip
Don't show new pr button when page is not compare pull (#26431)
Before: ![image](https://github.com/go-gitea/gitea/assets/18380374/ba69252f-3582-414a-9d62-b2b78d7035dd) After: ![image](https://github.com/go-gitea/gitea/assets/18380374/71b8587c-b96e-48fb-b3e5-1a2a8b5d06fa) (TestOrg:test is a tag not branch) Problem: In the template, we will not add `compare pull` class when `PageIsComparePull` is false. https://github.com/go-gitea/gitea/blob/a370efc13f0e1ea309e324639832832bc14cb6dc/templates/repo/diff/compare.tmpl#L2 But in the js, we are using `.repository.compare.pull` to find the button: https://github.com/go-gitea/gitea/blob/a370efc13f0e1ea309e324639832832bc14cb6dc/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.
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_en-US.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 5448db4b99..9a06bb0952 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1714,6 +1714,7 @@ pulls.select_commit_hold_shift_for_range = Select commit. Hold shift + click to
pulls.review_only_possible_for_full_diff = Review is only possible when viewing the full diff
pulls.filter_changes_by_commit = Filter by commit
pulls.nothing_to_compare = These branches are equal. There is no need to create a pull request.
+pulls.nothing_to_compare_have_tag = The selected branch/tag are equal.
pulls.nothing_to_compare_and_allow_empty_pr = These branches are equal. This PR will be empty.
pulls.has_pull_request = `A pull request between these branches already exists: <a href="%[1]s">%[2]s#%[3]d</a>`
pulls.create = Create Pull Request