diff --git a/app/controllers/api/pm/pipelines_controller.rb b/app/controllers/api/pm/pipelines_controller.rb index f8f073c96..fe94fd86f 100644 --- a/app/controllers/api/pm/pipelines_controller.rb +++ b/app/controllers/api/pm/pipelines_controller.rb @@ -69,6 +69,7 @@ class Api::Pm::PipelinesController < Api::Pm::BaseController @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_type: params[:pipeline_type]) if params[:pipeline_type].present? + @has_pipeline_ids = @pipelines.pluck(:project_id) @pipelines = @pipelines @pipelines = paginate @pipelines end diff --git a/app/views/api/pm/pipelines/index.json.jbuilder b/app/views/api/pm/pipelines/index.json.jbuilder index 975d36314..c7ee9e545 100644 --- a/app/views/api/pm/pipelines/index.json.jbuilder +++ b/app/views/api/pm/pipelines/index.json.jbuilder @@ -1,6 +1,6 @@ json.status 0 json.message "success" -json.projects @project_ids.each do |project_id| +json.projects @has_pipeline_ids.each do |project_id| json.id project_id project = Project.find_by(id: project_id) if project.present?