2809: Merge branch '2809-workbench-rails4' refs #2809

[arvados.git] / apps / workbench / app / controllers / pipeline_instances_controller.rb

diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index b477223b81d9041c7eb69e416b73b8f62290a510..d54cd4961e944108f719348eb21fe497f6facee3 100644 (file)
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -15,6 +15,12 @@ class PipelineInstancesController < ApplicationController
       p.components.each do |k, v|
         j = v[:job] || next
 
+        # The graph is interested in whether the component is
+        # indicated as persistent, more than whether the job
+        # satisfying it (which could have been reused, or someone
+        # else's) is.
+        j[:output_is_persistent] = v[:output_is_persistent]
+
         uuid = j[:uuid].intern
         provenance[uuid] = j
         pips[uuid] = 0 unless pips[uuid] != nil
@@ -45,38 +51,6 @@ class PipelineInstancesController < ApplicationController
   end
 
   def show
-    if @object.components.empty? and @object.pipeline_template_uuid
-      template = PipelineTemplate.find(@object.pipeline_template_uuid)
-      pipeline = {}
-      template.components.each do |component_name, component_props|
-        pipeline[component_name] = {}
-        component_props.each do |k, v|
-          if k == :script_parameters
-            pipeline[component_name][:script_parameters] = {}
-            v.each do |param_name, param_value|
-              if param_value.is_a? Hash
-                if param_value[:value]
-                  pipeline[component_name][:script_parameters][param_name] = param_value[:value]
-                elsif param_value[:default]
-                  pipeline[component_name][:script_parameters][param_name] = param_value[:default]
-                elsif param_value[:optional] != nil or param_value[:required] != nil
-                    pipeline[component_name][:script_parameters][param_name] = ""
-                else
-                  pipeline[component_name][:script_parameters][param_name] = param_value
-                end
-              else
-                pipeline[component_name][:script_parameters][param_name] = param_value
-              end
-            end
-          else
-            pipeline[component_name][k] = v
-          end
-        end
-      end
-      @object.components= pipeline
-      @object.save
-    end
-
     @pipelines = [@object]
 
     if params[:compare]
@@ -88,6 +62,7 @@ class PipelineInstancesController < ApplicationController
     provenance, pips = graph(@pipelines)
 
     @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
+      :request => request,
       :all_script_parameters => true, 
       :combine_jobs => :script_and_version,
       :script_version_nodes => true,
@@ -159,6 +134,7 @@ class PipelineInstancesController < ApplicationController
     @pipelines = @objects
 
     @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
+      :request => request,
       :all_script_parameters => true, 
       :combine_jobs => :script_and_version,
       :script_version_nodes => true,
@@ -173,12 +149,8 @@ class PipelineInstancesController < ApplicationController
     %w(Compare Graph)
   end 
 
-  def update
-    updates = params[@object.class.to_s.underscore.singularize.to_sym]
-    if updates["components"]
-      require 'deep_merge/rails_compat'
-      updates["components"] = updates["components"].deeper_merge(@object.components)
-    end
+  def index
+    @limit = 20
     super
   end