lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

* More redirects
* As per @6543

Co-Authored-By: 6543 <6543@obermui.de>
release/v1.15
zeripath 2020-01-27 10:26:53 +00:00 committed by GitHub
parent 03cb168127
commit 51f6a7ab10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
routers/repo/pull.go
View File

@ -679,7 +679,13 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
return return
} }
if issue.IsClosed { if issue.IsClosed {
ctx.NotFound("MergePullRequest", nil) if issue.IsPull {
ctx.Flash.Error(ctx.Tr("repo.pulls.is_closed"))
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
return
}
ctx.Flash.Error(ctx.Tr("repo.issues.closed_title"))
ctx.Redirect(ctx.Repo.RepoLink + "/issues/" + com.ToStr(issue.Index))
return return
} }
@ -691,12 +697,20 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
return return
} }
if !allowedMerge { 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 return
} }
if !pr.CanAutoMerge() || pr.HasMerged { if !pr.CanAutoMerge() {
ctx.NotFound("MergePullRequest", nil) 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 return
} }