Browse Source

Merge branch 'develop' into standalone_develop

pull/347/head
yystopf 2 years ago
parent
commit
a7b6dbc1a0
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      app/views/api/v1/projects/actions/runs/index.json.jbuilder

+ 2
- 2
app/views/api/v1/projects/actions/runs/index.json.jbuilder View File

@@ -15,8 +15,8 @@ if @result_object[:data]["Runs"].present?
end

json.status run["Status"]
json.time_ago time_from_now(run["Updated"])
json.holding_time run["Updated"]-run["Started"]
json.time_ago time_from_now(run["Started"])
json.holding_time run["Status"] == 6 ? Time.now.to_i - run["Started"] : run["Stopped"] - run["Started"]
end
else
json.runs []

Loading…
Cancel
Save