X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ff9d78bbeb09ca917f0814c6055c47db5a4e7e4a..a9b4a906124081439326fedc1a1e73fae9c2f40b:/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 caa8377ad0..018d49f5e4 100644 --- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb @@ -4,9 +4,9 @@
<%# column offset 0 %> -
+

- + <%= pj[:name] %>

@@ -39,14 +39,14 @@ <% if current_job[:state] == "Queued" %> <%# column offset 5 %>
- <% queuetime = Time.now - current_job[:created_at] %> + <% queuetime = Time.now - Time.parse(current_job[:created_at].to_s) %> Queued for <%= render_runtime(queuetime, true) %>. <% 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. - <% else %> + <% elsif current_job[:queue_position] %> There are <%= current_job[:queue_position] %> jobs in the queue ahead of this one. <% end %> <% rescue %> @@ -75,10 +75,10 @@
<% end %> - <% if current_job[:state].in? ["Queued", "Running"] %> + <% if current_job[:state].in? ["Queued", "Running"] and @object.editable? %> <%# column offset 11 %>
- <%= form_tag "/jobs/#{current_job[:uuid]}/cancel", style: "display:inline; padding-left: 1em" do |f| %> + <%= form_tag "/jobs/#{current_job[:uuid]}/cancel", remote: true, 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 %>