X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d23d4ce9e4c52605cb23286b9e9b46a808f7437d..bbaaeabfc2d28c8a24f106b81e6677832cd68b3d:/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 0841ed7dae..a10218a98f 100644 --- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb @@ -1,4 +1,4 @@ - <% current_job = pj[:job] if pj[:job] != {} %> + <% current_job = pj[:job] if pj[:job] != {} and pj[:job][:uuid] %>
@@ -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,11 +31,11 @@ <% end %>
- <% if Job::state(current_job).in? ["Completed", "Failed", "Canceled"] %> + <% if Job::state(current_job).in? ["Complete", "Failed", "Canceled"] %>
<% 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. @@ -46,7 +46,7 @@ <%= 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"} %>
@@ -56,12 +56,12 @@ <% 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 %> @@ -139,7 +139,7 @@ <% elsif k.to_s.end_with? 'uuid' %> <%= link_to_if_arvados_object current_component[k], friendly_name: true %> <% elsif k.to_s.end_with? '_at' %> - <%= current_component[k] %> + <%= render_localized_date(current_component[k]) %> <% else %> <%= current_component[k] %> <% end %>