4015: use portable_data_hash to populate chooser

diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index a618d435173b2a67db2cfcba3d5ef797db4cf8c0..3d34c7b885253fc3e1f5625dc9aa8ed8f2e06696 100644 (file)
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -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

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 66b7ed662abd86416f13e4b45a10faa5a786d8e0..cfe7f19187a064bb19759950778fd72a890854ae 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -269,6 +269,8 @@ module ApplicationHelper
           display_value = link.name
         elsif value_info[:link_name]
           display_value = value_info[:link_name]
+        elsif value_info[:selection_name]
+          display_value = value_info[:selection_name]
         end
       end
       if (attr == :components) and (subattr.size > 2)