Merge pull request #1827 from guerler/fix_upload_link_000

Fix upload tool routing
This commit is contained in:
Dannon Baker
2016-03-01 09:19:30 -05:00
5 changed files with 30 additions and 26 deletions
+7 -3
View File
@@ -116,9 +116,13 @@ window.app = function app( options, bootstrapped ){
home : function( params ){
// TODO: to router, remove Globals
// load a tool by id (tool_id) or rerun a previous tool execution (job_id)
if( ( params.tool_id || params.job_id ) && params.tool_id !== 'upload1' ){
this._loadToolForm( params );
if( params.tool_id || params.job_id ) {
if ( params.tool_id === 'upload1' ) {
Galaxy.upload.show();
this._loadCenterIframe( 'welcome' );
} else {
this._loadToolForm( params );
}
} else {
// show the workflow run form
if( params.workflow_id ){
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long