Merge branch 'master' into 3187-pipeline-instance-page

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

diff --git a/apps/workbench/app/views/jobs/_show_status.html.erb b/apps/workbench/app/views/jobs/_show_status.html.erb
index eff1e75260ab4387a68e707bd88766ca4abbece8..ede168d2d3b39767a5253a83d8ef5856c54880a3 100644 (file)
--- a/apps/workbench/app/views/jobs/_show_status.html.erb
+++ b/apps/workbench/app/views/jobs/_show_status.html.erb
@@ -7,27 +7,25 @@
   <% else %>
     Re-run job using script version:
     <%= form_tag '/jobs', style: "display:inline; padding-left: 1em" do |f| %>
-      <% [:script, :script_version, :repository, :output_is_persistent, :supplied_script_version, :nondeterministic].each do |d| %>
+      <% [:script, :script_version, :repository, :supplied_script_version, :nondeterministic].each do |d| %>
         <%= hidden_field :job, d, :value => @object[d] %>
       <% end %>
       <% [:script_parameters, :runtime_constraints].each do |d| %>
         <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
       <% end %>
-      <%= hidden_field :options, :no_reuse, :value => true %>
       <%= button_tag "Same as this run", {class: 'btn btn-primary', id: "re-run-same-job-button"} %>
     <% end %>
-  <% if !@object.supplied_script_version.nil? and !@object.supplied_script_version.empty? and @object.script_version != @object.supplied_script_version%>
+  <% if @object.respond_to? :supplied_script_version and !@object.supplied_script_version.nil? and !@object.supplied_script_version.empty? and @object.script_version != @object.supplied_script_version%>
       <%= form_tag '/jobs', style: "display:inline" do |f| %>
-      <% [:script, :repository, :output_is_persistent, :supplied_script_version, :nondeterministic].each do |d| %>
+      <% [:script, :repository, :supplied_script_version, :nondeterministic].each do |d| %>
         <%= hidden_field :job, d, :value => @object[d] %>
       <% end %>
       <%= hidden_field :job, :script_version, :value => @object[:supplied_script_version] %>
       <% [:script_parameters, :runtime_constraints].each do |d| %>
         <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
       <% end %>
-      <%= hidden_field :options, :no_reuse, :value => true %>
-        <%= button_tag "Latest (#{@object.repository}/#{@object.supplied_script_version})", {class: 'btn btn-primary', id: "re-run-latest-job-button"} %>
-      <% end %>
+      <%= button_tag "Latest (#{@object.repository}/#{@object.supplied_script_version})", {class: 'btn btn-primary', id: "re-run-latest-job-button"} %>
+    <% end %>
   <% end %>
 <% end %>
 </div>