Merge branch 'master' into 3177-collection-choose-files

[arvados.git] / 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 6738b11159a3fe5fe8d53574fa88d33c5ddd1774..85a1530204f18a6633feb07415438faec80fb66b 100644 (file)
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -37,7 +37,7 @@
           <% end %>
 
           <% if current_job[:state] == "Queued" %>
-            <%# column offset 3 %>
+            <%# column offset 5 %>
             <div class="col-md-6">
               <% queuetime = Time.now - current_job[:created_at] %>
               Queued for <%= render_runtime(queuetime, true) %>.
@@ -46,7 +46,7 @@
                   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.
-                <% else %>
+                <% elsif current_job[:queue_position] %>
                   There are <%= current_job[:queue_position] %> jobs in the queue ahead of this one.
                 <% end %>
               <% rescue %>