peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplified checking for open dependencies

Browse Source 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
This commit is contained in:
Konrad Langenberg 2017-09-24 16:29:25 +02:00 committed by Konrad
parent 837c917798
commit fe8181af73
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/issue_dependency.go
View File

@ -139,7 +139,7 @@ func IssueNoDependenciesLeft(issue *Issue) bool {
var issueDeps []IssueDependencyIssue var issueDeps []IssueDependencyIssue
err := x.Join("INNER", "issue", "issue.id = issue_dependency.issue_id").Find(&issueDeps) err := x.Join("INNER", "issue", "issue.id = issue_dependency.issue_id").Find(&issueDeps)
if err != nil { if err != nil {
return false return false
} }

19
routers/repo/issue.go
View File

@ -920,18 +920,15 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) {
!(issue.IsPull && issue.PullRequest.HasMerged) { !(issue.IsPull && issue.PullRequest.HasMerged) {
// Check for open dependencies // Check for open dependencies
if form.Status == "close" { if form.Status == "close" && models.IssueNoDependenciesLeft(issue) {
if issue.IsPull {
if models.IssueNoDependenciesLeft(issue) { ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!")
if issue.IsPull { ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index))
ctx.Flash.Error("You need to close all issues blocking this pull request before you can merge it!") } else {
ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index)) ctx.Flash.Error("You need to close all issues blocking this issue before you can close it!")
} else { ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index))
ctx.Flash.Error("You need to close all issues blocking this issue before you can close it!")
ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, issue.Index))
}
return
} }
return
} }
// Duplication and conflict check should apply to reopen pull request. // Duplication and conflict check should apply to reopen pull request.