From 11c39483d74a13aca9ff8c3cbf271619e04025ee Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 14 Jul 2023 06:35:05 +0000 Subject: [PATCH 1/2] fix --- routers/web/repo/issue.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 317f762fb1a21..0f0a427414d47 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -2762,7 +2762,17 @@ func UpdateIssueStatus(ctx *context.Context) { ctx.ServerError("LoadRepositories", err) return } + if err := issues.LoadPullRequests(ctx); err != nil { + ctx.ServerError("LoadPullRequests", err) + return + } + for _, issue := range issues { + if issue.IsPull { + if issue.PullRequest.HasMerged { + continue + } + } if issue.IsClosed != isClosed { if err := issue_service.ChangeStatus(issue, ctx.Doer, "", isClosed); err != nil { if issues_model.IsErrDependenciesLeft(err) { From be514b8bcecdab5e2b55a83862798b33b0351a9b Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 14 Jul 2023 17:00:41 +0900 Subject: [PATCH 2/2] Update routers/web/repo/issue.go Co-authored-by: Lunny Xiao --- routers/web/repo/issue.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 0f0a427414d47..6f8d6dd788abd 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -2768,10 +2768,8 @@ func UpdateIssueStatus(ctx *context.Context) { } for _, issue := range issues { - if issue.IsPull { - if issue.PullRequest.HasMerged { - continue - } + if issue.IsPull && issue.PullRequest.HasMerged { + continue } if issue.IsClosed != isClosed { if err := issue_service.ChangeStatus(issue, ctx.Doer, "", isClosed); err != nil {