Browse Source

Only show "New Pull Request" button if repo allows pulls (#7426)

Signed-off-by: Gary Kim <gary@garykim.dev>
tags/v1.11.0-dev
Gary Kim techknowlogick 6 years ago
parent
commit
ae759990d1
2 changed files with 2 additions and 1 deletions
  1. +1
    -0
      routers/repo/branch.go
  2. +1
    -1
      templates/repo/branch/list.tmpl

+ 1
- 0
routers/repo/branch.go View File

@@ -39,6 +39,7 @@ func Branches(ctx *context.Context) {
ctx.Data["Title"] = "Branches" ctx.Data["Title"] = "Branches"
ctx.Data["IsRepoToolbarBranches"] = true ctx.Data["IsRepoToolbarBranches"] = true
ctx.Data["DefaultBranch"] = ctx.Repo.Repository.DefaultBranch ctx.Data["DefaultBranch"] = ctx.Repo.Repository.DefaultBranch
ctx.Data["AllowsPulls"] = ctx.Repo.Repository.AllowsPulls()
ctx.Data["IsWriter"] = ctx.Repo.CanWrite(models.UnitTypeCode) ctx.Data["IsWriter"] = ctx.Repo.CanWrite(models.UnitTypeCode)
ctx.Data["IsMirror"] = ctx.Repo.Repository.IsMirror ctx.Data["IsMirror"] = ctx.Repo.Repository.IsMirror
ctx.Data["PageIsViewCode"] = true ctx.Data["PageIsViewCode"] = true


+ 1
- 1
templates/repo/branch/list.tmpl View File

@@ -63,7 +63,7 @@
</td> </td>
<td class="right aligned"> <td class="right aligned">
{{if not .LatestPullRequest}} {{if not .LatestPullRequest}}
{{if not .IsDeleted}}
{{if and (not .IsDeleted) $.AllowsPulls}}
<a href="{{$.RepoLink}}/compare/{{$.DefaultBranch | EscapePound}}...{{if ne $.Repository.Owner.Name $.Owner.Name}}{{$.Owner.Name}}:{{end}}{{.Name | EscapePound}}"> <a href="{{$.RepoLink}}/compare/{{$.DefaultBranch | EscapePound}}...{{if ne $.Repository.Owner.Name $.Owner.Name}}{{$.Owner.Name}}:{{end}}{{.Name | EscapePound}}">
<button id="new-pull-request" class="ui compact basic button">{{$.i18n.Tr "repo.pulls.compare_changes"}}</button> <button id="new-pull-request" class="ui compact basic button">{{$.i18n.Tr "repo.pulls.compare_changes"}}</button>
</a> </a>


Loading…
Cancel
Save