Add label hiding option without need to overwrite actual label

galaxyproject · Dec 27, 2016 · d84221e · d84221e
1 parent 71b6447
commit d84221e
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/client/galaxy/scripts/mvc/form/form-section.js b/client/galaxy/scripts/mvc/form/form-section.js
@@ -144,7 +144,7 @@ function( Utils, Ui, Portlet, Repeat, InputElement, Parameters ) {
             this.app.field_list[ id ] = field;
             var input_element = new InputElement( this.app, {
                 name                : input_def.name,
-                label               : input_def.label || input_def.name,
+                label               : input_def.hide_label ? '' : input_def.label || input_def.name,
                 value               : input_def.value,
                 text_value          : input_def.text_value,
                 collapsible_value   : input_def.collapsible_value,

diff --git a/client/galaxy/scripts/mvc/tool/tool-form-composite.js b/client/galaxy/scripts/mvc/tool/tool-form-composite.js
@@ -272,7 +272,8 @@ define([ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view'
                             );
                     }
                 } else {
-                    _.each( step.inputs, function( input ) { input.flavor = 'module' } );
+                    var is_simple_input = ([ 'data_input', 'data_collection_input' ]).indexOf( step.step_type ) != -1;
+                    _.each( step.inputs, function( input ) { input.flavor = 'module'; input.hide_label = is_simple_input; } );
                     form = new Form( Utils.merge({
                         title    : '<b>' + step.name + '</b>',
                         onchange : function() { _.each( self.links[ step.index ], function( link ) { self._refreshStep( link ) } ) },

diff --git a/static/maps/mvc/form/form-section.js.map b/static/maps/mvc/form/form-section.js.map