Merge branch 'master' into 10293-cwl-cr-output

[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 fc8bd4b1977b1c3bbfdeaa95719ec1b00a52d812..c5fbda0cf349177801a0bcbbd75c7c95634b56ef 100644 (file)
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -300,12 +300,14 @@ class PipelineInstancesController < ApplicationController
             value = tv[:value]
           elsif tv[:default]
             value = tv[:default]
+          else
+            value = ''
           end
-          if value
+          if value.present?
             split = value.split '/'
             if CollectionsHelper.match(split[0])
               input_pdhs << split[0]
-            elsif CollectionsHelper.match_uuid_with_optional_filepath(split[0])
+            else
               input_uuids << split[0]
             end
           end