调整未关联issue 和设定组织搜索空间范围
This commit is contained in:
parent
bbc3717737
commit
84895231dc
|
@ -31,9 +31,10 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
|
|||
not_join_id << @issue.id
|
||||
object_issues = Issue.where(
|
||||
pm_project_id: params[:pm_project_id],
|
||||
root_id: nil,
|
||||
pm_issue_type: pm_issue_type
|
||||
).where.not(id: not_join_id)
|
||||
|
||||
object_issues = object_issues.where(root_id: nil, child_count: 0) if params[:issue_filter_type] == 'leaf_issue'
|
||||
@issues = kaminari_paginate(object_issues)
|
||||
render 'api/v1/issues/index'
|
||||
end
|
||||
|
@ -121,9 +122,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
|
|||
return render_error('请输入正确的ID数组!') unless params[:ids].is_a?(Array)
|
||||
params[:ids].each do |id|
|
||||
@issue = Issue.find_by(id: id, pm_project_id: params[:pm_project_id])
|
||||
if @issue.blank?
|
||||
return render_not_found("ID为#{id}的疑修不存在!")
|
||||
end
|
||||
return render_not_found("ID为#{id}的疑修不存在!") if @issue.blank?
|
||||
end
|
||||
if params[:ids].blank?
|
||||
@issues = Issue.where(pm_project_id: params[:pm_project_id])
|
||||
|
|
|
@ -10,6 +10,7 @@ class Organizations::ProjectsController < Organizations::BaseController
|
|||
@projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects")
|
||||
# 表情处理
|
||||
keywords = params[:search].to_s.each_char.select { |c| c.bytes.first < 240 }.join('')
|
||||
@projects = (@projects.where(id: params[:pm_project_repository_ids].split(',')) if params[:pm_project_repository_ids].present?)
|
||||
@projects = @projects.ransack(name_or_identifier_cont: keywords).result if params[:search].present?
|
||||
@projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}")
|
||||
@projects = paginate(@projects)
|
||||
|
|
Loading…
Reference in New Issue