Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

On merge of already closed PR redirect back to the pulls page #10010

Merged
merged 6 commits into from
Jan 27, 2020
Merged

On merge of already closed PR redirect back to the pulls page #10010

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6b164fb
On merge of already closed PR redirect back to the pulls page
zeripath Jan 26, 2020
3aaafdc
Merge branch 'master' into on-already-merged-redirect-back
lunny Jan 27, 2020
56e286e
Merge branch 'master' into on-already-merged-redirect-back
lunny Jan 27, 2020
52bb1f0
More redirects
zeripath Jan 27, 2020
de74c5e
As per @6543
zeripath Jan 27, 2020
3a1b7ff
Apply suggestions from code review
zeripath Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More redirects
  • Loading branch information
@zeripath
zeripath committed Jan 27, 2020
commit 52bb1f02c78806bce67d5da1e26758ada9800ce3
22 changes: 17 additions & 5 deletions routers/repo/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,12 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
return
}
if issue.IsClosed {
ctx.Flash.Error(ctx.Tr("repo.pulls.is_closed"))
ctx.Redirect(ctx.Repo.RepoLink + "/pulls" + com.ToStr(issue.Index))
if issue.IsPull {
ctx.Flash.Error(ctx.Tr("repo.pulls.is_closed"))
} else {
ctx.Flash.Error(ctx.Tr("repo.issues.closed_title"))
}
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
zeripath marked this conversation as resolved.
Show resolved Hide resolved
zeripath marked this conversation as resolved.
Show resolved Hide resolved
return
}

Expand All @@ -692,12 +696,20 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
return
}
if !allowedMerge {
ctx.NotFound("MergePullRequest", nil)
ctx.Flash.Error(ctx.Tr("repo.pulls.update_not_allowed"))
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
return
}

if !pr.CanAutoMerge() || pr.HasMerged {
ctx.NotFound("MergePullRequest", nil)
if !pr.CanAutoMerge() {
ctx.Flash.Error(ctx.Tr("repo.pulls.no_merge_not_ready"))
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
return
}

if pr.HasMerged {
ctx.Flash.Error(ctx.Tr("repo.pulls.has_merged"))
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
return
}

Expand Down