diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-11-06 03:11:35 +0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2017-11-05 21:11:35 +0200 |
| commit | ff9daa3e9be55ed5942ff161973fa1f747ab5b7e (patch) | |
| tree | bf6842d2d430816904f7a1d36714c46741c67267 | |
| parent | 80a464335990f3a0dec646d07c2bd0d9f6208f38 (diff) | |
| download | gitea-ff9daa3e9be55ed5942ff161973fa1f747ab5b7e.tar.gz gitea-ff9daa3e9be55ed5942ff161973fa1f747ab5b7e.zip | |
fix click create pull request button 404 (#2859)
| -rw-r--r-- | modules/context/repo.go | 1 | ||||
| -rw-r--r-- | templates/repo/home.tmpl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/context/repo.go b/modules/context/repo.go index c61010ecba..883a826e44 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -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)) { diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index c7c88aafcc..0db8f37320 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -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> |