From 5ec21d56ef2a002327b705ede5adabe3f1f13f34 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 23 Feb 2017 13:05:29 -0500 Subject: [PATCH] editor: fix cannot redirect to correct pull request URL Was only possible to correctly redirect to pull request page within same repository. And didn't take care of case when upstream has disabled pull request. Also add a new method 'PullRequestURL' to unify the code. --- modules/context/repo.go | 10 ++++++++++ routers/repo/editor.go | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/context/repo.go b/modules/context/repo.go index 710cbbf62..fdde6b92c 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -98,6 +98,16 @@ func (r *Repository) GetEditorconfig() (*editorconfig.Editorconfig, error) { return editorconfig.ParseBytes(data) } +// PullRequestURL returns URL for composing a pull request. +// This function does not check if the repository can actually compose a pull request. +func (r *Repository) PullRequestURL(baseBranch, headBranch string) string { + repoLink := r.RepoLink + if r.PullRequest.BaseRepo != nil { + repoLink = r.PullRequest.BaseRepo.Link() + } + return fmt.Sprintf("%s/compare/%s...%s:%s", repoLink, baseBranch, r.Owner.Name, headBranch) +} + func RetrieveBaseRepo(ctx *Context, repo *models.Repository) { // Non-fork repository will not return error in this method. if err := repo.GetBaseRepo(); err != nil { diff --git a/routers/repo/editor.go b/routers/repo/editor.go index 326a8c7e4..83302039f 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -279,8 +279,8 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo return } - if form.IsNewBrnach() { - ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + oldBranchName + "..." + form.NewBranchName) + if form.IsNewBrnach() && ctx.Repo.PullRequest.Allowed { + ctx.Redirect(ctx.Repo.PullRequestURL(oldBranchName, form.NewBranchName)) } else { ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + template.EscapePound(form.TreePath)) } @@ -382,8 +382,8 @@ func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) { return } - if form.IsNewBrnach() { - ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + oldBranchName + "..." + form.NewBranchName) + if form.IsNewBrnach() && ctx.Repo.PullRequest.Allowed { + ctx.Redirect(ctx.Repo.PullRequestURL(oldBranchName, form.NewBranchName)) } else { ctx.Flash.Success(ctx.Tr("repo.editor.file_delete_success", ctx.Repo.TreePath)) ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName) @@ -503,8 +503,8 @@ func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) { return } - if form.IsNewBrnach() { - ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + oldBranchName + "..." + form.NewBranchName) + if form.IsNewBrnach() && ctx.Repo.PullRequest.Allowed { + ctx.Redirect(ctx.Repo.PullRequestURL(oldBranchName, form.NewBranchName)) } else { ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + form.TreePath) }