Merge branch 'master' into 3382-always-show-inputs

diff --git a/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb b/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb
index 45739192861efe22d26a287ed6f7610c3c1d9e36..65d458bb787ea5dad8d5a8b99dc6bd17aec30893 100644 (file)
--- a/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb
@@ -7,9 +7,8 @@
       <% next if !component %>
       <% component[:script_parameters].andand.each do |pname, pvalue_spec| %>
         <% if pvalue_spec.is_a? Hash %>
-          <% if (pvalue_spec[:description] or
-                 ((pvalue_spec[:required] or pvalue_spec[:optional] == false) and
-                  not pvalue_spec[:value])) %>
+          <% if pvalue_spec[:description] or
+                pvalue_spec[:required] or pvalue_spec[:optional] == false %>
             <% n_inputs += 1 %>
             <label for="<% "#{cname}-#{pname}" %>">
               <%= @object.component_input_title(cname, pname) %>