From 1e05adfc3eeeeee04be48c683185886fa4b00dee Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Fri, 17 Jun 2022 12:52:06 +0800
Subject: [PATCH] Delete duplicated update btn on pull request view page
(#19993)
Fix #19987
---
templates/repo/issue/view_content/pull.tmpl | 40 +--------------------
1 file changed, 1 insertion(+), 39 deletions(-)
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index d2282f07f6..5a23bfa33b 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -283,7 +283,7 @@
{{end}}
{{end}}
- {{if (gt .Issue.PullRequest.CommitsBehind 0)}}
+ {{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}}
<div class="ui divider"></div>
<div class="item item-section">
<div class="item-section-left">
@@ -481,44 +481,6 @@
{{end}}
{{end}}
- {{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}}
- <div class="item df ac sb">
- <div>
- <i class="icon icon-octicon">{{svg "octicon-alert"}}</i>
- {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}}
- </div>
- <div>
- {{if and .UpdateAllowed .UpdateByRebaseAllowed }}
- <div class="dib">
- <div class="ui buttons update-button">
- <button class="ui button" data-do="{{.Link}}/update" data-redirect="{{.Link}}">
- <span class="button-text">
- {{$.i18n.Tr "repo.pulls.update_branch"}}
- </span>
- </button>
-
- <div class="ui dropdown icon button no-text">
- {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- <div class="menu">
- <div class="item active selected" data-do="{{.Link}}/update">{{$.i18n.Tr "repo.pulls.update_branch"}}</div>
- <div class="item" data-do="{{.Link}}/update?style=rebase">{{$.i18n.Tr "repo.pulls.update_branch_rebase"}}</div>
- </div>
- </div>
- </div>
- </div>
- {{end}}
- {{if and .UpdateAllowed (not .UpdateByRebaseAllowed)}}
- <form action="{{.Link}}/update" method="post">
- {{.CsrfTokenHtml}}
- <button class="ui compact button" data-do="update">
- <span class="ui text">{{$.i18n.Tr "repo.pulls.update_branch"}}</span>
- </button>
- </form>
- {{end}}
- </div>
- </div>
- {{end}}
-
{{if $.StillCanManualMerge}}
<div class="ui divider"></div>
<div class="ui form manually-merged-fields" style="display: none">