修复:合并请求查询关闭类型须根据合并请求类型查询
This commit is contained in:
parent
0d9accfb35
commit
6d3c7ddac4
|
@ -17,7 +17,11 @@ class Issues::ListQueryService < ApplicationService
|
|||
issues = all_issues.issue_index_includes
|
||||
issues = issues.includes(pull_request: :reviewers)
|
||||
if status_type.to_s == "2" #表示关闭中的
|
||||
issues = issues.where(status_id: 5)
|
||||
if(select_type == "Issue")
|
||||
issues = issues.where(status_id: 5)
|
||||
else
|
||||
issues = issues.joins(:pull_request).where(pull_requests: {status: 2})
|
||||
end
|
||||
elsif status_type.to_s == "1"
|
||||
if(select_type == "Issue")
|
||||
issues = issues.where.not(status_id: 5) #默认显示开启中的
|
||||
|
|
Loading…
Reference in New Issue