X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0662b235357dd40b5d27efd06b60044ddcec06f6..6fb70ef1e1398c30137580c8417e98693dfbfc1d:/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 cb27f1c463..ded535ef3a 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -17,31 +17,31 @@
<%= pj[:progress_bar] %>
- <% if current_job %>
- <%# column offset 4 %>
- <% if(pipeline_display rescue nil) %>
- <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
-
- <% if current_job[:log] %>
+ <%# column offset 4 %>
+ <% if not current_job %>
+
+ <% else %>
+
+ <% if (pipeline_display rescue nil) %>
+ <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
+ <% if current_job[:log] %>
<% logCollection = Collection.find? current_job[:log] %>
<% if logCollection %>
<%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
<% else %>
Log unavailable
<% end %>
- <% end %>
-
- <% elsif current_job[:state] == "Running" %>
-
+ <% end %>
+ <% elsif current_job[:state] == "Running" %>
<% job = Job.find? current_job[:uuid] %>
<% if job %>
<%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
<% else %>
Log unavailable
<% end %>
-
+ <% end %>
<% end %>
- <% end %>
+
<%# column offset 5 %>
<% if current_job[:state] != "Queued" %>
@@ -61,16 +61,6 @@
<% queuetime = Time.now - Time.parse(current_job[:created_at].to_s) %>
Queued for <%= render_runtime(queuetime, false) %>.
- <% begin %>
- <% if current_job[:queue_position] == 0 %>
- This job is next in the queue to run.
- <% elsif current_job[:queue_position] == 1 %>
- There is 1 job in the queue ahead of this one.
- <% elsif current_job[:queue_position] %>
- There are <%= current_job[:queue_position] %> jobs in the queue ahead of this one.
- <% end %>
- <% rescue %>
- <% end %>
<% elsif current_job[:state] == "Running" %>
<%# column offset 8 %>