1
0
Fork 0

Don't show a dropdown menu when only 1 merge option is available (#13660) (#13670)

This commit is contained in:
Jimmy Praet 2020-11-22 14:58:12 +01:00 committed by GitHub
parent de1e4b2da9
commit 2791cc139e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 16 deletions

View file

@ -113,6 +113,24 @@ func (cfg *PullRequestsConfig) IsMergeStyleAllowed(mergeStyle MergeStyle) bool {
mergeStyle == MergeStyleSquash && cfg.AllowSquash mergeStyle == MergeStyleSquash && cfg.AllowSquash
} }
// AllowedMergeStyleCount returns the total count of allowed merge styles for the PullRequestsConfig
func (cfg *PullRequestsConfig) AllowedMergeStyleCount() int {
count := 0
if cfg.AllowMerge {
count++
}
if cfg.AllowRebase {
count++
}
if cfg.AllowRebaseMerge {
count++
}
if cfg.AllowSquash {
count++
}
return count
}
// BeforeSet is invoked from XORM before setting the value of a field of this object. // BeforeSet is invoked from XORM before setting the value of a field of this object.
func (r *RepoUnit) BeforeSet(colName string, val xorm.Cell) { func (r *RepoUnit) BeforeSet(colName string, val xorm.Cell) {
switch colName { switch colName {

View file

@ -335,6 +335,7 @@
{{end}} {{end}}
</span> </span>
</button> </button>
{{if gt $prUnit.PullRequestsConfig.AllowedMergeStyleCount 1}}
<div class="ui dropdown icon button"> <div class="ui dropdown icon button">
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu"> <div class="menu">
@ -352,6 +353,7 @@
{{end}} {{end}}
</div> </div>
</div> </div>
{{end}}
</div> </div>
{{else}} {{else}}
<div class="ui divider"></div> <div class="ui divider"></div>