Increase limit for collections controller querying same portable_data_hash as

[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 8ee06c3d011b8303f0c9726f894341533a8d0888..a618d435173b2a67db2cfcba3d5ef797db4cf8c0 100644 (file)
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -16,12 +16,16 @@ class PipelineInstancesController < ApplicationController
       @object.components.each do |cname, component|
         # Go through the script parameters of each component
         # that are marked as user input and copy them over.
-        component[:script_parameters].each do |pname, val|
-          if val.is_a? Hash and val[:dataclass]
-            # this is user-inputtable, so check the value from the source pipeline
-            srcvalue = source.components[cname][:script_parameters][pname]
-            if not srcvalue.nil?
-              component[:script_parameters][pname] = srcvalue
+        # Skip any components that are not present in the
+        # source instance (there's nothing to copy)
+        if source.components.include? cname
+          component[:script_parameters].each do |pname, val|
+            if val.is_a? Hash and val[:dataclass]
+              # this is user-inputtable, so check the value from the source pipeline
+              srcvalue = source.components[cname][:script_parameters][pname]
+              if not srcvalue.nil?
+                component[:script_parameters][pname] = srcvalue
+              end
             end
           end
         end
@@ -33,7 +37,7 @@ class PipelineInstancesController < ApplicationController
     if params['script'] == 'use_same'
       # Go through each component and copy the script_version from each job.
       @object.components.each do |cname, component|
-        if source.components[cname][:job]
+        if source.components.include? cname and source.components[cname][:job]
           component[:script_version] = source.components[cname][:job][:script_version]
         end
       end
@@ -43,6 +47,13 @@ class PipelineInstancesController < ApplicationController
       component.delete :job
     end
     @object.state = 'New'
+
+    # set owner_uuid to that of source, provided it is a project and wriable by current user
+    current_project = Group.find(source.owner_uuid) rescue nil
+    if (current_project && current_project.writable_by.andand.include?(current_user.uuid))
+      @object.owner_uuid = source.owner_uuid
+    end
+
     super
   end