forked from Trustie/forgeplus
新增: issue列表的pm_issue_types查询
This commit is contained in:
parent
b08c1763ac
commit
50986035e2
|
@ -4,7 +4,7 @@ class Api::V1::Issues::ListService < ApplicationService
|
||||||
attr_reader :project, :only_name, :category, :participant_category, :keyword, :author_id, :issue_tag_ids
|
attr_reader :project, :only_name, :category, :participant_category, :keyword, :author_id, :issue_tag_ids
|
||||||
attr_reader :begin_date, :end_date
|
attr_reader :begin_date, :end_date
|
||||||
attr_reader :milestone_id, :assigner_id, :status_id, :priority_id, :sort_by, :sort_direction, :current_user
|
attr_reader :milestone_id, :assigner_id, :status_id, :priority_id, :sort_by, :sort_direction, :current_user
|
||||||
attr_reader :pm_project_id, :pm_sprint_id, :root_id, :pm_issue_type, :status_ids, :ids, :exclude_ids
|
attr_reader :pm_project_id, :pm_sprint_id, :root_id, :pm_issue_type, :status_ids, :ids, :exclude_ids, :pm_issue_types
|
||||||
attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count, :complete_issues_count
|
attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count, :complete_issues_count
|
||||||
|
|
||||||
validates :category, inclusion: { in: %w[all opened closed], message: '请输入正确的Category'}
|
validates :category, inclusion: { in: %w[all opened closed], message: '请输入正确的Category'}
|
||||||
|
@ -35,6 +35,7 @@ class Api::V1::Issues::ListService < ApplicationService
|
||||||
@ids = params[:ids]
|
@ids = params[:ids]
|
||||||
@exclude_ids = params[:exclude_ids]
|
@exclude_ids = params[:exclude_ids]
|
||||||
@status_ids = params[:status_ids].present? ? params[:status_ids].split(',') : []
|
@status_ids = params[:status_ids].present? ? params[:status_ids].split(',') : []
|
||||||
|
@pm_issue_types = params[:pm_issue_types].present? ? params[:pm_issue_types].split(',') : []
|
||||||
@sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'desc').downcase
|
@sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'desc').downcase
|
||||||
@current_user = current_user
|
@current_user = current_user
|
||||||
end
|
end
|
||||||
|
@ -110,6 +111,9 @@ class Api::V1::Issues::ListService < ApplicationService
|
||||||
# status_ids
|
# status_ids
|
||||||
issues = issues.where(status_id: status_ids) unless status_ids.blank?
|
issues = issues.where(status_id: status_ids) unless status_ids.blank?
|
||||||
|
|
||||||
|
# pm_issue_types
|
||||||
|
issues = issues.where(pm_issue_type: pm_issue_types) unless pm_issue_types.blank?
|
||||||
|
|
||||||
# ids
|
# ids
|
||||||
issues = issues.where(id: ids.to_s.split(",")) if ids.present?
|
issues = issues.where(id: ids.to_s.split(",")) if ids.present?
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue