diff --git a/client/galaxy/scripts/mvc/app/app-analysis.js b/client/galaxy/scripts/mvc/app/app-analysis.js index e4a31febba2..2cc08b6b89f 100644 --- a/client/galaxy/scripts/mvc/app/app-analysis.js +++ b/client/galaxy/scripts/mvc/app/app-analysis.js @@ -10,7 +10,7 @@ define(['utils/utils', 'mvc/tools', 'mvc/upload/upload-view', 'mvc/ui/ui-misc', var params = this.options.params; this.$( '#galaxy_main' ).prop( 'src', Galaxy.root + ( ( params.tool_id && ( 'tool_runner?' + $.param( params ) ) ) || - ( params.workflow_id && ( 'workflow/run?workflow_id=' + params.workflow_id ) ) || + ( params.workflow_id && ( 'workflow/run?id=' + params.workflow_id ) ) || ( params.m_c && ( params.m_c + '/' + params.m_a ) ) || ( Galaxy.config.require_login && !Galaxy.user.id && 'user/login') || 'root/welcome' @@ -42,7 +42,7 @@ define(['utils/utils', 'mvc/tools', 'mvc/upload/upload-view', 'mvc/ui/ui-misc', layout : options.toolbox_in_panel }); tool_panel_view = new Tools.ToolPanelView({ model: tool_panel }); - + // add tool panel to Galaxy object Galaxy.toolPanel = tool_panel; @@ -51,7 +51,18 @@ define(['utils/utils', 'mvc/tools', 'mvc/upload/upload-view', 'mvc/ui/ui-misc', tool_panel_view.render(); this.$( '.toolMenu' ).show(); } - this.$el.append( tool_panel_view.$el ); + this.$el.prepend( tool_panel_view.$el ); + this.$( '.toolSectionBody' ).append( this._templateTool({ + title : 'All workflows', + href : 'workflow/list_for_run' + }) ) + for ( var i in options.stored_workflow_menu_entries ) { + var m = options.stored_workflow_menu_entries[ i ]; + this.$( '.toolSectionBody' ).append( this._templateTool({ + title : m.stored_workflow.name, + href : 'workflow/run?id=' + m.encoded_stored_workflow_id + }) ); + } // minsize init hint this.$( 'a[minsizehint]' ).click( function() { @@ -73,35 +84,28 @@ define(['utils/utils', 'mvc/tools', 'mvc/upload/upload-view', 'mvc/ui/ui-misc', } }, - _template: function() { - var tmpl = '