forked from Gitlink/forgeplus
fixed:代码回滚
This commit is contained in:
parent
3317771ada
commit
063f6d8e58
|
|
@ -36,11 +36,8 @@ 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'
|
||||
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))
|
||||
@issues = kaminari_paginate(object_issues)
|
||||
render 'api/v1/issues/index'
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue