Trustie
/
forgeplus
forked from Gitlink/forgeplus
0
0
Fork 10
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改: 关联issue列表不查询已关闭数据

This commit is contained in:
yystopf 2025-07-31 15:19:39 +08:00
parent 1efb9b3241
commit 017802a7c4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/api/pm/issues_controller.rb
View File

@ -36,7 +36,11 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
).where.not(id: not_join_id).order(updated_on: :desc)
object_issues = object_issues.where(root_id: nil, child_count: 0) if params[:issue_filter_type] == 'leaf_issue'
@issues = kaminari_paginate(object_issues)
except_closed_issues_1 = object_issues.where(pm_issue_type: 1, status_id: [2,7,8]).to_sql
except_closed_issues_2 = object_issues.where(pm_issue_type: [2,3], status_id: [3,5,6]).to_sql
except_closed_issues_ids = Issue.from("( #{except_closed_issues_1} union #{except_closed_issues_2}) as issues").pluck(:id)
@issues = kaminari_paginate(object_issues.where.not(id: except_closed_issues_ids))
render 'api/v1/issues/index'
end
@ -46,6 +50,10 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
.where.not(id: Issue.full_children_issues(@issue).map{|i|i.id})
@issues = @issues.where(pm_issue_type: params[:pm_issue_type]) if params[:pm_issue_type].present?
@issues = @issues.ransack(id_or_project_issues_index_eq: params[:keyword]).result.or(@issues.ransack(subject_or_description_cont: params[:keyword]).result) if params[:keyword].present?
except_closed_issues_1 = @issues.where(pm_issue_type: 1, status_id: [2,7,8]).to_sql
except_closed_issues_2 = @issues.where(pm_issue_type: [2,3], status_id: [3,5,6]).to_sql
except_closed_issues_ids = Issue.from("( #{except_closed_issues_1} union #{except_closed_issues_2}) as issues").pluck(:id)
@issues = @issues.where.not(id: except_closed_issues_ids)
@issues = @issues.reorder("#{issue_sort_by} #{issue_sort_direction}")
if params[:only_name].present?
@issues = kaminary_select_paginate(