fixed 流水线去掉没有流水线的仓库
This commit is contained in:
parent
2a0d4d6f45
commit
0274456442
|
@ -69,6 +69,7 @@ class Api::Pm::PipelinesController < Api::Pm::BaseController
|
||||||
@pipelines = Action::Pipeline.where(project_id: @project_ids).order(updated_at: :desc)
|
@pipelines = Action::Pipeline.where(project_id: @project_ids).order(updated_at: :desc)
|
||||||
@pipelines = @pipelines.where("pipeline_name like ?", "%#{params[:pipeline_name]}%") if params[:pipeline_name].present?
|
@pipelines = @pipelines.where("pipeline_name like ?", "%#{params[:pipeline_name]}%") if params[:pipeline_name].present?
|
||||||
@pipelines = @pipelines.where(pipeline_type: params[:pipeline_type]) if params[:pipeline_type].present?
|
@pipelines = @pipelines.where(pipeline_type: params[:pipeline_type]) if params[:pipeline_type].present?
|
||||||
|
@has_pipeline_ids = @pipelines.pluck(:project_id)
|
||||||
@pipelines = @pipelines
|
@pipelines = @pipelines
|
||||||
@pipelines = paginate @pipelines
|
@pipelines = paginate @pipelines
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
json.status 0
|
json.status 0
|
||||||
json.message "success"
|
json.message "success"
|
||||||
json.projects @project_ids.each do |project_id|
|
json.projects @has_pipeline_ids.each do |project_id|
|
||||||
json.id project_id
|
json.id project_id
|
||||||
project = Project.find_by(id: project_id)
|
project = Project.find_by(id: project_id)
|
||||||
if project.present?
|
if project.present?
|
||||||
|
|
Loading…
Reference in New Issue