From 6ec77f5e9078869046f4bcbc00ddb2e87cf6c04e Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 5 Nov 2025 11:30:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF=E7=AD=89=E5=BE=85=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BB=A5=E5=8F=8A=E5=90=88=E5=B9=B6=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=9B=B4=E6=96=B0=E9=9C=80=E8=BE=93=E5=85=A5=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 4 ++-- app/views/api/v1/projects/actions/runs/index.json.jbuilder | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index dd10ddad1..ed5e90743 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -99,8 +99,8 @@ class PullRequestsController < ApplicationController return render_forbidden("你没有权限操作.") unless @project.operator?(current_user) if params[:title].nil? normal_status(-1, "名称不能为空") - elsif params[:issue_tag_ids].nil? - normal_status(-1, "标记不能为空") + # elsif params[:issue_tag_ids].nil? + # normal_status(-1, "标记不能为空") else ActiveRecord::Base.transaction do begin diff --git a/app/views/api/v1/projects/actions/runs/index.json.jbuilder b/app/views/api/v1/projects/actions/runs/index.json.jbuilder index 860f8bb68..e09efc8ec 100644 --- a/app/views/api/v1/projects/actions/runs/index.json.jbuilder +++ b/app/views/api/v1/projects/actions/runs/index.json.jbuilder @@ -18,7 +18,7 @@ if @has_file json.status run["Status"] json.detail_status @result_object[:data]["DetailStatusList"].select{|s| s["RunID"] == run["ID"]}[0].present? ? @result_object[:data]["DetailStatusList"].select{|s| s["RunID"] == run["ID"]}[0]["Status"].sort![0] : run["Status"] - json.time_ago time_from_now(run["Started"]) + json.time_ago run["Started"].zero? ? "未开始" : time_from_now(run["Started"]) json.started run["Started"] json.holding_time run["Status"] == 6 ? Time.now.to_i - run["Started"] : run["Stopped"] - run["Started"] end