From 2e7e25e2d1434d7a328c240b82e7bd5a5fd4c3fb Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 24 Jan 2025 08:32:53 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=20=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=9F=A5=E8=AF=A2=E8=BF=90=E8=A1=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E6=88=90=E4=B8=80=E7=BB=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E4=BD=BF=E7=94=A8,status?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/pm/action_runs_controller.rb | 6 +++--- .../api/v1/projects/actions/actions_controller.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/pm/action_runs_controller.rb b/app/controllers/api/pm/action_runs_controller.rb index c450b8908..88bb6b129 100644 --- a/app/controllers/api/pm/action_runs_controller.rb +++ b/app/controllers/api/pm/action_runs_controller.rb @@ -2,11 +2,11 @@ class Api::Pm::ActionRunsController < Api::Pm::BaseController before_action :require_login def index - render_error('请输入workflows') if params[:workflows].blank? + tip_exception('请输入workflows') if params[:workflows].blank? @owner = Owner.find_by(login: params[:owner_id].to_s) || Owner.find_by(id: params[:owner_id].to_s) - render_error('组织未找到') if @owner.blank? + tip_exception('组织未找到') if @owner.blank? action_runs = Gitea::ActionRun.where(owner_id: @owner.gitea_uid) - group_data = action_runs.where(workflow_id: params[:workflows].to_s.split(",")).group(:workflow_id, :status).count + group_data = action_runs.where(workflow_id: params[:workflows].to_s.split(",")).where(status: [1,2]).group(:workflow_id, :status).count @result = [] params[:workflows].to_s.split(",").each do |file| last_action_run = action_runs.where(workflow_id: file).order(updated: :desc).first diff --git a/app/controllers/api/v1/projects/actions/actions_controller.rb b/app/controllers/api/v1/projects/actions/actions_controller.rb index 7186067c2..0d7d51336 100644 --- a/app/controllers/api/v1/projects/actions/actions_controller.rb +++ b/app/controllers/api/v1/projects/actions/actions_controller.rb @@ -5,7 +5,7 @@ class Api::V1::Projects::Actions::ActionsController < Api::V1::Projects::Actions @action_runs = Gitea::ActionRun.where(repo_id: @project.gpid) @action_runs = @action_runs.where(id: params[:ids].split(",")) if params[:ids].present? @action_runs = @action_runs.where(workflow_id: params[:workflow_ids].split(",")) if params[:workflow_ids].present? - group_data = @action_runs.group(:workflow_id, :status).count + group_data = @action_runs.where(status: [1,2]).group(:workflow_id, :status).count @result = [] @files.map{|i|i['name']}.each do |file| last_action_run = @action_runs.where(workflow_id: file).order(updated: :desc).first