Merge pull request #3636 from guerler/fix_annotation

[17.01] Fix annotation display for data inputs
galaxyproject · Feb 21, 2017 · 09c08d1 · 09c08d1
2 parents 493cf28 + f1f6bf6
commit 09c08d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/client/galaxy/scripts/mvc/tool/tool-form-composite.js b/client/galaxy/scripts/mvc/tool/tool-form-composite.js
@@ -39,12 +39,16 @@ define([ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view'
             _.each( this.model.get( 'steps' ), function( step, i ) {
                 Galaxy.emit.debug( 'tool-form-composite::initialize()', i + ' : Preparing workflow step.' );
                 var icon = WorkflowIcons[step.step_type];
+                var description = step.description;
+                if ( step.annotation ) {
+                    description = ' - ' + step.annotation;
+                }
                 step = Utils.merge( {
                     index                   : i,
-                    name                    : step.name,
+                    name                    : _.escape( step.name ),
                     icon                    : icon || '',
                     help                    : null,
-                    description             : step.annotation && ' - ' + step.annotation || step.description,
+                    description             : _.escape( description || '' ),
                     citations               : null,
                     collapsible             : true,
                     collapsed               : i > 0 && !self._isDataStep( step ),
@@ -275,7 +279,7 @@ define([ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view'
                     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>',
+                        title    : '<b>' + step.name + '</b>' + step.description,
                         onchange : function() { _.each( self.links[ step.index ], function( link ) { self._refreshStep( link ) } ) },
                         inputs   : step.inputs && step.inputs.length > 0 ? step.inputs : [ { type: 'hidden', name: 'No options available.', ignore: null } ]
                     }, step ) );