X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4578ee9a75a326eea77d0f2e84737ebcfda3fdcc..cbc29982e30fd776c194c47dc584710ff1b340c4:/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 ce3befae06..3d34c7b885 100644 --- a/apps/workbench/app/controllers/pipeline_instances_controller.rb +++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb @@ -48,7 +48,7 @@ class PipelineInstancesController < ApplicationController end @object.state = 'New' - # set owner_uuid to that of source, provided it is wriable by current user + # 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 @@ -64,7 +64,8 @@ class PipelineInstancesController < ApplicationController if component[:script_parameters] component[:script_parameters].each do |param, value_info| if value_info.is_a? Hash - if resource_class_for_uuid(value_info[:value]) == Link + value_info_class = resource_class_for_uuid(value_info[:value]) + if value_info_class == Link # Use the link target, not the link itself, as script # parameter; but keep the link info around as well. link = Link.find value_info[:value] @@ -76,6 +77,15 @@ class PipelineInstancesController < ApplicationController value_info[:link_uuid] = nil value_info[:link_name] = nil end + if value_info_class == Collection + # to ensure reproducibility, the script_parameter for a + # collection should be the portable_data_hash + # keep the collection name and uuid for human-readability + obj = Collection.find value_info[:value] + value_info[:value] = obj.portable_data_hash + value_info[:selection_uuid] = obj.uuid + value_info[:selection_name] = obj.name + end end end end