From 58d7e4f3182bfda5c4d05c98947e4dba3809942b Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 22 Feb 2024 17:13:06 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Lunny Xiao Co-authored-by: wxiaoguang --- models/issues/issue_list.go | 4 ++-- templates/shared/issue_dependency.tmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/issues/issue_list.go b/models/issues/issue_list.go index 5684d3a398..a354a5cb1f 100644 --- a/models/issues/issue_list.go +++ b/models/issues/issue_list.go @@ -607,7 +607,7 @@ func (issues IssueList) BlockingDependenciesMap(ctx context.Context) (issueDepsM Table("issue"). Join("INNER", "repository", "repository.id = issue.repo_id"). Join("INNER", "issue_dependency", "issue_dependency.issue_id = issue.id"). - Where(builder.In("dependency_id", issues.getIssueIDs())). + Where(builder.In("issue_dependency.dependency_id", issues.getIssueIDs())). // sort by repo id then created date Asc("issue.repo_id"). Asc("issue.created_unix"). @@ -633,7 +633,7 @@ func (issues IssueList) BlockedByDependenciesMap(ctx context.Context) (issueDeps Table("issue"). Join("INNER", "repository", "repository.id = issue.repo_id"). Join("INNER", "issue_dependency", "issue_dependency.dependency_id = issue.id"). - Where(builder.In("issue_id", issues.getIssueIDs())). + Where(builder.In("issue_dependency.issue_id", issues.getIssueIDs())). // sort by repo id then created date Asc("issue.repo_id"). Asc("issue.created_unix"). diff --git a/templates/shared/issue_dependency.tmpl b/templates/shared/issue_dependency.tmpl index 0587b9bcb1..a1f4d14481 100644 --- a/templates/shared/issue_dependency.tmpl +++ b/templates/shared/issue_dependency.tmpl @@ -1,5 +1,5 @@ {{if .Dependencies}}
- {{(ctx.Locale.Tr .TitleKey .Dependencies) | Safe}} + {{ctx.Locale.Tr .TitleKey .Dependencies}}
{{end}}