Browse Source

fix click create pull request button 404 (#2859)

tags/v1.3.0-rc1
Lunny Xiao 6 years ago
parent
commit
ff9daa3e9b
2 changed files with 2 additions and 1 deletions
  1. 1
    0
      modules/context/repo.go
  2. 1
    1
      templates/repo/home.tmpl

+ 1
- 0
modules/context/repo.go View File

@@ -424,6 +424,7 @@ func RepoAssignment() macaron.Handler {
return
}
}
ctx.Data["IsForkedRepo"] = repo.IsFork

// People who have push access or have forked repository can propose a new pull request.
if ctx.Repo.IsWriter() || (ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)) {

+ 1
- 1
templates/repo/home.tmpl View File

@@ -27,7 +27,7 @@
<div class="ui secondary menu">
{{if .PullRequestCtx.Allowed}}
<div class="fitted item">
<a href="{{.BaseRepo.Link}}/compare/{{.BaseRepo.DefaultBranch}}...{{if .SignedUser.HasForkedRepo .BaseRepo.ID }}{{.SignedUser.Name}}:{{end}}{{.BranchName}}">
<a href="{{.BaseRepo.Link}}/compare/{{.BaseRepo.DefaultBranch}}...{{if .IsForkedRepo}}{{.Repository.Owner.Name}}:{{else}}{{if .SignedUser.HasForkedRepo .BaseRepo.ID}}{{.SignedUser.Name}}:{{end}}{{end}}{{.BranchName}}">
<button class="ui green tiny compact button"><i class="octicon octicon-git-compare"></i></button>
</a>
</div>

Loading…
Cancel
Save