Skip to content

Commit

Permalink
Alert error message if open dependencies are included in the issues t…
Browse files Browse the repository at this point in the history
…hat try to batch close (#24329)

fix #24185 

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
  • Loading branch information
sillyguodong and wxiaoguang authored Apr 26, 2023
1 parent df9a62b commit 8f57aa0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1541,6 +1541,7 @@ issues.dependency.issue_closing_blockedby = Closing this issue is blocked by the
issues.dependency.issue_close_blocks = This issue blocks closing of the following issues
issues.dependency.pr_close_blocks = This pull request blocks closing of the following issues
issues.dependency.issue_close_blocked = You need to close all issues blocking this issue before you can close it.
issues.dependency.issue_batch_close_blocked = "Cannot batch close issues that you choose, because issue #%d still has open dependencies"
issues.dependency.pr_close_blocked = You need to close all issues blocking this pull request before you can merge it.
issues.dependency.blocks_short = Blocks
issues.dependency.blocked_by_short = Depends on
Expand Down
2 changes: 1 addition & 1 deletion routers/web/repo/issue.go
Original file line number Diff line number Diff line change
Expand Up @@ -2689,7 +2689,7 @@ func UpdateIssueStatus(ctx *context.Context) {
if err := issue_service.ChangeStatus(issue, ctx.Doer, "", isClosed); err != nil {
if issues_model.IsErrDependenciesLeft(err) {
ctx.JSON(http.StatusPreconditionFailed, map[string]interface{}{
"error": "cannot close this issue because it still has open dependencies",
"error": ctx.Tr("repo.issues.dependency.issue_batch_close_blocked", issue.Index),
})
return
}
Expand Down
2 changes: 2 additions & 0 deletions web_src/js/features/repo-issue-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ function initRepoIssueListCheckboxes() {
elementId
).then(() => {
window.location.reload();
}).catch((reason) => {
window.alert(reason.responseJSON.error);
});
});
}
Expand Down

0 comments on commit 8f57aa0

Please sign in to comment.