Merge pull request #5022 from dannon/workflow_editor_fix_backport

[17.09] Fix workflow editor output attributes.

client/galaxy/scripts/mvc/workflow/workflow-forms.js

@@ -152,7 +152,7 @@ define( [ 'utils/utils', 'mvc/form/form-view', 'mvc/tool/tool-form-base' ], func
         var output_id        = node.output_terminals && Object.keys( node.output_terminals )[ 0 ];
 
         /** Visit input nodes and enrich by name/value pairs from server data */
-        function visit( head, head_list ) {
+        function visit( head, head_list, output_id ) {
             head_list = head_list || [];
             head_list.push( head );
             for ( var i in head.inputs ) {
@@ -182,7 +182,7 @@ define( [ 'utils/utils', 'mvc/form/form-view', 'mvc/tool/tool-form-base' ], func
                         }
                     }
                 }
-                input.inputs && visit( input, head_list.slice( 0 ) );
+                input.inputs && visit( input, head_list.slice( 0 ), output_id );
             }
         }
 
@@ -300,7 +300,7 @@ define( [ 'utils/utils', 'mvc/form/form-view', 'mvc/tool/tool-form-base' ], func
                     help    : 'This action will set column assignments in the output dataset. Blank fields are ignored.'
                 }]
             };
-            visit( input_config );
+            visit( input_config, [], output_id );
             return input_config;
         }
 

client/package-lock.json

@@ -1175,13 +1175,6 @@
             }
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -1191,6 +1184,13 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "bundled": true,