Fix error display

galaxyproject · Jan 15, 2017 · 9c9c4d2 · 9c9c4d2
1 parent 6c4a4ce
commit 9c9c4d2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/client/galaxy/scripts/mvc/tool/tool-form-composite.js b/client/galaxy/scripts/mvc/tool/tool-form-composite.js
@@ -462,7 +462,7 @@ define([ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view'
                         if ( response && response.err_data ) {
                             for ( var i in self.forms ) {
                                 var form = self.forms[ i ];
-                                var step_related_errors = response.err_data[ form.options.step_index ];
+                                var step_related_errors = response.err_data[ form.model.get( 'step_index' ) ];
                                 if ( step_related_errors ) {
                                     var error_messages = form.data.matchResponse( step_related_errors );
                                     for ( var input_id in error_messages ) {

diff --git a/client/galaxy/scripts/mvc/workflow/workflow-view.js b/client/galaxy/scripts/mvc/workflow/workflow-view.js
@@ -665,11 +665,10 @@ define([
                 content.icon = WorkflowIcons[ node.type ];
                 content.cls = 'ui-portlet-narrow';
                 if ( node.type == 'tool' ) {
-                    var options = content;
-                    options.node = node;
-                    options.workflow = this.workflow;
-                    options.datatypes = this.datatypes;
-                    form = new ToolForm.View( options );
+                    content.node = node;
+                    content.workflow = this.workflow;
+                    content.datatypes = this.datatypes;
+                    form = new ToolForm.View( content );
                 } else {
                     if ( content.inputs && content.inputs.length > 0 ) {
                         content.inputs.unshift({

diff --git a/static/maps/mvc/tool/tool-form-composite.js.map b/static/maps/mvc/tool/tool-form-composite.js.map
diff --git a/static/maps/mvc/workflow/workflow-view.js.map b/static/maps/mvc/workflow/workflow-view.js.map
diff --git a/static/scripts/mvc/tool/tool-form-composite.js b/static/scripts/mvc/tool/tool-form-composite.js
diff --git a/static/scripts/mvc/workflow/workflow-view.js b/static/scripts/mvc/workflow/workflow-view.js