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 423147508d0238a22937a4ffc089943b54ac3b0e..d54cd4961e944108f719348eb21fe497f6facee3 100644 (file)
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -51,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 or param_value[:dataclass] != 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]
@@ -181,17 +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
-    super
-  end
-
   def index
-    @objects ||= model_class.limit(20).all
+    @limit = 20
     super
   end