X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/409fe707a4d05f1986d7bb0c29ec977d19aa63f5..4b3e5e50e262fc51a158c1aed1942b1ef176e2eb:/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
index 1d52e281f6..038efece35 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -18,9 +18,9 @@
<% if current_job[:started_at] %>
- <% walltime = ((if current_job.finished_at then current_job.finished_at else Time.now() end) - current_job.started_at) %>
+ <% walltime = ((if current_job[:finished_at] then current_job[:finished_at] else Time.now() end) - current_job[:started_at]) %>
<% cputime = tasks.map { |task|
- if task.started_at and task.job_uuid == current_job.uuid
+ if task.started_at and task.job_uuid == current_job[:uuid]
(if task.finished_at then task.finished_at else Time.now() end) - task.started_at
else
0
@@ -31,37 +31,37 @@
<% end %>
- <% if Job::state(current_job).in? ["Complete", "Failed", "Canceled"] %>
+ <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
<% if pj[:output_uuid] %>
<%= link_to_if_arvados_object pj[:output_uuid], friendly_name: true %>
- <% elsif current_job.andand[:output] %>
+ <% elsif current_job[:output] %>
<%= link_to_if_arvados_object current_job[:output], link_text: "Output of #{pj[:name]}" %>
<% else %>
No output.
<% end %>
- <% elsif Job::state(current_job) == "Running" %>
+ <% elsif current_job[:state] == "Running" %>
<%= pj[:progress_bar] %>
- <%= form_tag "/jobs/#{current_job.uuid}/cancel", style: "display:inline; padding-left: 1em" do |f| %>
+ <%= form_tag "/jobs/#{current_job[:uuid]}/cancel", style: "display:inline; padding-left: 1em" do |f| %>
<%= hidden_field_tag :return_to, url_for(@object) %>
<%= button_tag "Cancel", {class: 'btn btn-xs btn-danger', id: "cancel-job-button"} %>
<% end %>
- <% elsif Job::state(current_job) == "Queued" %>
+ <% elsif current_job[:state] == "Queued" %>
<% queuetime = Time.now - current_job[:created_at] %>
Queued for <%= render_runtime(queuetime, true) %>.
<% begin %>
- <% if current_job.queue_position == 0 %>
+ <% if current_job[:queue_position] == 0 %>
This job is next in the queue to run.
- <% elsif current_job.queue_position == 1 %>
+ <% elsif current_job[:queue_position] == 1 %>
There is 1 job in the queue ahead of this one.
<% else %>
- There are <%= current_job.queue_position %> jobs in the queue ahead of this one.
+ There are <%= current_job[:queue_position] %> jobs in the queue ahead of this one.
<% end %>
<% rescue %>
<% end %>