diff --git a/client/galaxy/scripts/mvc/app/app-analysis.js b/client/galaxy/scripts/mvc/app/app-analysis.js index 6bb1527c5d8..01f1bd86c4e 100644 --- a/client/galaxy/scripts/mvc/app/app-analysis.js +++ b/client/galaxy/scripts/mvc/app/app-analysis.js @@ -1,33 +1,19 @@ define(['utils/utils', 'mvc/tools', 'mvc/upload/upload-view', 'mvc/ui/ui-misc', 'mvc/history/options-menu', 'mvc/history/history-panel-edit-current'], function( Utils, Tools, Upload, Ui, optionsMenu, HistoryPanel ) { - // create form view + /* Builds the center panel */ var CenterPanel = Backbone.View.extend({ - // initialize initialize: function( options ) { this.options = Utils.merge( options, {} ); this.setElement( this._template() ); - - /*if trans.app.config.require_login and not trans.user: - center_url = h.url_for( controller='user', action='login' ) - elif tool_id is not None: - center_url = h.url_for( 'tool_runner', tool_id=tool_id, from_noframe=True, **params ) - elif workflow_id is not None: - center_url = h.url_for( controller='workflow', action='run', id=workflow_id ) - elif m_c is not None: - center_url = h.url_for( controller=m_c, action=m_a ) - else: - center_url = h.url_for( controller="root", action="welcome" )*/ - - var src = 'welcome'; - window.console.log(Galaxy.config); - if ( Galaxy.config.require_login && !Galaxy.user.valid ) { - src = 'user/login'; - } else { - if (true ) { - } - } - this.$( '#galaxy_main' ).prop( 'src', galaxy_config.root + src ); + var params = this.options.params; + this.$( '#galaxy_main' ).prop( 'src', galaxy_config.root + ( + ( params.tool_id && ( 'tool_runner?' + $.param( params ) ) ) || + ( params.workflow_id && ( 'workflow/run?workflow_id=' + params.workflow_id ) ) || + ( params.m_c && ( params.m_c + '/' + params.m_a ) ) || + ( !Galaxy.config.require_login && Galaxy.user.valid && 'user/login') || + 'root/welcome' + )); }, _template: function() { @@ -37,7 +23,7 @@ define(['utils/utils', 'mvc/tools', 'mvc/upload/upload-view', 'mvc/ui/ui-misc', } }); - // create form view + /* Builds the tool panel on the left */ var LeftPanel = Backbone.View.extend({ initialize: function( options ) { this.options = Utils.merge( options, {} ); @@ -120,6 +106,7 @@ define(['utils/utils', 'mvc/tools', 'mvc/upload/upload-view', 'mvc/ui/ui-misc', } }); + /* Builds the history panel on the right */ var RightPanel = Backbone.View.extend({ initialize: function(options) { this.options = Utils.merge( options, {} ); diff --git a/static/maps/mvc/app/app-analysis.js.map b/static/maps/mvc/app/app-analysis.js.map index f7adaf4321a..200d9320ae4 100644 --- a/static/maps/mvc/app/app-analysis.js.map +++ b/static/maps/mvc/app/app-analysis.js.map @@ -1 +1 @@ -{"version":3,"file":"app-analysis.js","sources":["../../../src/mvc/app/app-analysis.js"],"names":["define","Utils","Tools","Upload","Ui","optionsMenu","HistoryPanel","CenterPanel","Backbone","View","extend","initialize","options","this","merge","setElement","_template","src","window","console","log","Galaxy","config","require_login","user","valid","$","prop","galaxy_config","root","LeftPanel","tool_search","ToolSearch","spinner_url","search_url","hidden","tools","ToolCollection","toolbox","tool_panel","ToolPanel","layout","toolbox_in_panel","tool_panel_view","ToolPanelView","model","toolPanel","get","size","render","show","$el","append","click","parent","handle_minwidth_hint","attr","upload","components","header","title","buttons","RightPanel","buttonRefresh","ButtonLink","id","cls","icon","onclick","top","currHistoryPanel","loadCurrentHistory","buttonOptions","target","href","buttonViewMulti","body","historyOptionsMenu","anonymous","purgeAllowed","allow_user_dataset_purge","CurrentHistoryPanel","el","linkTarget","$scrollContainer","connectToQuotaMeter","quotaMeter","listenToGalaxy","left","center","right"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app-analysis.js","sources":["../../../src/mvc/app/app-analysis.js"],"names":["define","Utils","Tools","Upload","Ui","optionsMenu","HistoryPanel","CenterPanel","Backbone","View","extend","initialize","options","this","merge","setElement","_template","params","$","prop","galaxy_config","root","tool_id","param","workflow_id","m_c","m_a","Galaxy","config","require_login","user","valid","LeftPanel","tool_search","ToolSearch","spinner_url","search_url","hidden","tools","ToolCollection","toolbox","tool_panel","ToolPanel","layout","toolbox_in_panel","tool_panel_view","ToolPanelView","model","toolPanel","get","size","render","show","$el","append","click","parent","handle_minwidth_hint","attr","upload","components","header","title","buttons","RightPanel","buttonRefresh","ButtonLink","id","cls","icon","onclick","top","currHistoryPanel","loadCurrentHistory","buttonOptions","target","href","buttonViewMulti","body","historyOptionsMenu","anonymous","purgeAllowed","allow_user_dataset_purge","CurrentHistoryPanel","el","linkTarget","$scrollContainer","connectToQuotaMeter","quotaMeter","listenToGalaxy","left","center","right"],"mappings":"AAAAA,QAAQ,cAAe,YAAa,yBAA0B,iBAAkB,2BAA4B,0CACxG,SAAUC,EAAOC,EAAOC,EAAQC,EAAIC,EAAaC,GAGjD,GAAIC,GAAcC,SAASC,KAAKC,QAC5BC,WAAY,SAAUC,GAClBC,KAAKD,QAAUX,EAAMa,MAAOF,MAC5BC,KAAKE,WAAYF,KAAKG,YACtB,IAAIC,GAASJ,KAAKD,QAAQK,MAC1BJ,MAAKK,EAAG,gBAAiBC,KAAM,MAAOC,cAAcC,MAC9CJ,EAAOK,SAAa,eAAiBJ,EAAEK,MAAON,IAC9CA,EAAOO,aAAiB,4BAA8BP,EAAOO,aAC7DP,EAAOQ,KAASR,EAAOQ,IAAM,IAAMR,EAAOS,MACzCC,OAAOC,OAAOC,eAAiBF,OAAOG,KAAKC,OAAS,cACvD,kBAIRf,UAAW,WACP,MAAQ,2LAOZgB,EAAYxB,SAASC,KAAKC,QAC1BC,WAAY,SAAUC,GAKlB,GAJAC,KAAKD,QAAUX,EAAMa,MAAOF,MAC5BC,KAAKE,WAAYF,KAAKG,aAGjBW,OAAOG,KAAKC,QAAUJ,OAAOC,OAAOC,cAAgB,CACrD,GAAII,GAAc,GAAI/B,GAAMgC,YACxBC,YAAcvB,EAAQuB,YACtBC,WAAcxB,EAAQwB,WACtBC,QAAc,IAEdC,EAAQ,GAAIpC,GAAMqC,eAAgB3B,EAAQ4B,SAC1CC,EAAa,GAAIvC,GAAMwC,WACvBT,YAAcA,EACdK,MAAcA,EACdK,OAAc/B,EAAQgC,kBAE1BC,iBAAkB,GAAI3C,GAAM4C,eAAgBC,MAAON,IAGnDd,OAAOqB,UAAYP,EAGfA,EAAWQ,IAAK,UAAWC,OAAS,IACpCL,gBAAgBM,SAChBtC,KAAKK,EAAG,aAAckC,QAE1BvC,KAAKwC,IAAIC,OAAQT,gBAAgBQ,KAGjCxC,KAAKK,EAAG,kBAAmBqC,MAAO,WACzBC,OAAOC,sBACRD,OAAOC,qBAAsBvC,EAAEL,MAAM6C,KAAM,kBAKnD/B,OAAOgC,OAAS,GAAIxD,GAAQS,GAG5BC,KAAK+C,YACDC,QACIC,MAAU,QACVC,SAAYpC,OAAOgC,YAMnC3C,UAAW,WACP,MAAQ,gOAgCZgD,EAAaxD,SAASC,KAAKC,QAC3BC,WAAY,SAASC,GACjBC,KAAKD,QAAUX,EAAMa,MAAOF,MAC5BC,KAAKE,WAAYF,KAAKG,YAGtB,IAAIiD,GAAgB,GAAI7D,GAAG8D,YACvBC,GAAU,yBACVL,MAAU,kBACVM,IAAU,sBACVC,KAAU,gBACVC,QAAU,WACFC,IAAI5C,QAAU4C,IAAI5C,OAAO6C,kBACzBD,IAAI5C,OAAO6C,iBAAiBC,wBAIpCC,EAAgB,GAAItE,GAAG8D,YACvBC,GAAU,yBACVL,MAAU,kBACVM,IAAU,sBACVO,OAAU,cACVN,KAAU,YACVO,KAAUjD,OAAON,KAAO,yBAExBwD,EAAkB,GAAIzE,GAAG8D,YACzBC,GAAU,4BACVL,MAAU,qBACVM,IAAU,sBACVC,KAAU,gBACVO,KAAUjD,OAAON,KAAO,yBAI5BR,MAAK+C,YACDC,QACIC,MAAU,UACVM,IAAU,uBACVL,SAAYE,EAAeS,EAAeG,IAE9CC,MACIV,IAAU,kCAKlBzC,OAAOoD,mBAAqB1E,EAAaqE,EAAcrB,KACnD2B,UAAepE,EAAQkB,KAAKC,OAAS,QAAU,QAC/CkD,aAAetD,OAAOC,OAAOsD,0BAA4B,QAAU,QACnE7D,KAAeM,OAAON,OAI1BM,OAAO6C,iBAAmB,GAAIlE,GAAa6E,qBACvCC,GAAkBvE,KAAKwC,IACvB4B,aAAkBtD,OAAOC,OAAOsD,yBAChCG,WAAkB,cAClBC,iBAAkB,WAAY,MAAOzE,MAAKwC,IAAIG,YAElD7B,OAAO6C,iBAAiBe,oBAAqB5D,OAAO6D,YACpD7D,OAAO6C,iBAAiBiB,eAAgB9D,QACxCA,OAAO6C,iBAAiBC,sBAI5BzD,UAAW,WACP,MAAO,4DAIf,QACI0E,KAAU1D,EACV2D,OAAUpF,EACVqF,MAAU5B"} \ No newline at end of file diff --git a/static/scripts/mvc/app/app-analysis.js b/static/scripts/mvc/app/app-analysis.js index dece976242d..6cc854feedd 100644 --- a/static/scripts/mvc/app/app-analysis.js +++ b/static/scripts/mvc/app/app-analysis.js @@ -1,2 +1,2 @@ -define(["utils/utils","mvc/tools","mvc/upload/upload-view","mvc/ui/ui-misc","mvc/history/options-menu","mvc/history/history-panel-edit-current"],function(a,b,c,d,e,f){var g=Backbone.View.extend({initialize:function(b){this.options=a.merge(b,{}),this.setElement(this._template());var c="welcome";window.console.log(Galaxy.config),Galaxy.config.require_login&&!Galaxy.user.valid&&(c="user/login"),this.$("#galaxy_main").prop("src",galaxy_config.root+c)},_template:function(){return'