Merge branch 'master' into 3634-tab-state

[arvados.git] / apps / workbench / app / views / jobs / show.html.erb

diff --git a/apps/workbench/app/views/jobs/show.html.erb b/apps/workbench/app/views/jobs/show.html.erb
index d72fa3fa4238dd2f1e2172e6555e2a4438d717b4..276aec5eb47228a8167d22f54f50eb66d4e4c215 100644 (file)
--- a/apps/workbench/app/views/jobs/show.html.erb
+++ b/apps/workbench/app/views/jobs/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for :tab_line_buttons do %>
-    <% if @object.running %>
+    <% if @object.state == "Running" %>
     <%= form_tag "/jobs/#{@object.uuid}/cancel", style: "display:inline; padding-left: 1em" do |f| %>
       <%= button_tag "Cancel running job", {class: 'btn btn-sm btn-danger', id: "cancel-job-button"} %>
     <% end %>
@@ -28,5 +28,5 @@
 <% end %>
 <% end %>
 
-<%= render partial: 'default_show' %>
+<%= render partial: 'title_and_buttons' %>
 <%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.show_pane_list }%>