diff options
| author | Unknwon <u@gogs.io> | 2017-04-03 22:24:21 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2017-04-03 22:24:21 -0400 |
| commit | b873ec2bcea6d7b6205925646275c27f7f157a93 (patch) | |
| tree | 08c3551d2b0f715ca072b035a6690907e4e085b4 | |
| parent | 1bc805bb4b1f9d3afbbce357939b28594e372c58 (diff) | |
templates/repo/branches: hide pull request button if not allowed (#4377)
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | routers/repo/branch.go | 1 | ||||
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/repo/branches/all.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/branches/overview.tmpl | 2 |
5 files changed, 5 insertions, 4 deletions
@@ -16,7 +16,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.11.0.0403" +const APP_VER = "0.11.1.0403" func init() { setting.AppVer = APP_VER diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 08b1b068..d9a45fba 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -61,6 +61,7 @@ func loadBranches(ctx *context.Context) []*Branch { } } + ctx.Data["AllowPullRequest"] = ctx.Repo.Repository.AllowsPulls() return branches } diff --git a/templates/.VERSION b/templates/.VERSION index 7d2fee28..9102c746 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.11.0.0403
\ No newline at end of file +0.11.1.0403
\ No newline at end of file diff --git a/templates/repo/branches/all.tmpl b/templates/repo/branches/all.tmpl index d374acaa..f962884d 100644 --- a/templates/repo/branches/all.tmpl +++ b/templates/repo/branches/all.tmpl @@ -19,7 +19,7 @@ <div class="ui four wide column"> {{if and (eq $.BranchName .Name) $.IsRepositoryWriter}} <a class="ui basic blue button" href="{{$.RepoLink}}/settings/branches">{{$.i18n.Tr "repo.branches.change_default_branch"}}</a> - {{else if $.IsRepositoryAdmin}} + {{else if and $.IsRepositoryWriter $.AllowPullRequest}} <a class="ui basic button" href="{{$.RepoLink}}/compare/{{$.DefaultBranch.Name}}...{{.Name}}"><i class="octicon octicon-git-pull-request"></i> {{$.i18n.Tr "repo.pulls.new"}}</a> {{end}} </div> diff --git a/templates/repo/branches/overview.tmpl b/templates/repo/branches/overview.tmpl index be31e7f5..921bce24 100644 --- a/templates/repo/branches/overview.tmpl +++ b/templates/repo/branches/overview.tmpl @@ -35,7 +35,7 @@ {{$timeSince := TimeSince .Commit.Committer.When $.Lang}} <span class="ui text light grey">{{$.i18n.Tr "repo.branches.updated_by" $timeSince .Commit.Committer.Name | Safe}}</span> </div> - {{if $.IsRepositoryWriter}} + {{if and $.IsRepositoryWriter $.AllowPullRequest}} <div class="ui four wide column"> <a class="ui basic button" href="{{$.RepoLink}}/compare/{{$.DefaultBranch.Name}}...{{.Name}}"><i class="octicon octicon-git-pull-request"></i> {{$.i18n.Tr "repo.pulls.new"}}</a> </div> |