Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench

[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 12db3c3b6413058c8dbeb7182a8548a3c65a05d4..b477223b81d9041c7eb69e416b73b8f62290a510 100644 (file)
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -59,7 +59,7 @@ class PipelineInstancesController < ApplicationController
                   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] and param_value.length == 1
+                elsif param_value[:optional] != nil or param_value[:required] != nil
                     pipeline[component_name][:script_parameters][param_name] = ""
                 else
                   pipeline[component_name][:script_parameters][param_name] = param_value