From a47a5e89da8ef30b10115a96ade74e2efb6fbf1f Mon Sep 17 00:00:00 2001 From: guerler Date: Sat, 5 Sep 2015 01:44:10 -0400 Subject: [PATCH] Fix workflow links in tool panel --- client/galaxy/scripts/mvc/app/app-analysis.js | 64 +++++++++-------- static/maps/mvc/app/app-analysis.js.map | 2 +- static/scripts/mvc/app/app-analysis.js | 2 +- templates/webapps/galaxy/root/index.mako | 70 +++++++++++-------- 4 files changed, 75 insertions(+), 63 deletions(-) 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 = '
' + - '' + - '
' + - '
' + - '
' + - 'Workflows' + - '
' + - '
' + - '
'; + _templateTool: function( options ) { + return '
' + + '' + options.title + '' + + '
'; + }, - /*%if t.user.stored_workflow_menu_entries: - %for m in t.user.stored_workflow_menu_entries: - - %endfor - %endif*/ - tmpl += '
' + - 'All workflows' + - '
' + - '
' + + _template: function() { + return '
' + + ''; - return tmpl; + '
' + + '
' + + '
' + + '
' + + 'Workflows' + + '
' + + '
' + + '
' + + '
' + + '
'; } }); diff --git a/static/maps/mvc/app/app-analysis.js.map b/static/maps/mvc/app/app-analysis.js.map index b02ac9c6c35..e01a908a10a 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","params","$","prop","Galaxy","root","tool_id","param","workflow_id","m_c","m_a","config","require_login","user","id","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","tmpl","RightPanel","buttonRefresh","ButtonLink","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","root","tool_id","param","workflow_id","m_c","m_a","config","require_login","user","id","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","prepend","append","_templateTool","title","href","i","stored_workflow_menu_entries","m","stored_workflow","name","encoded_stored_workflow_id","click","parent","handle_minwidth_hint","attr","upload","components","header","buttons","RightPanel","buttonRefresh","ButtonLink","cls","icon","onclick","top","currHistoryPanel","loadCurrentHistory","buttonOptions","target","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,iBACtD,2BAA4B,0CAChC,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,OAAOC,MACvCJ,EAAOK,SAAa,eAAiBJ,EAAEK,MAAON,IAC9CA,EAAOO,aAAiB,mBAAqBP,EAAOO,aACpDP,EAAOQ,KAASR,EAAOQ,IAAM,IAAMR,EAAOS,KAC1CN,OAAOO,OAAOC,gBAAkBR,OAAOS,KAAKC,IAAM,cACpD,kBAGRd,UAAW,WACP,MAAQ,2LAOZe,EAAYvB,SAASC,KAAKC,QAC1BC,WAAY,SAAUC,GAIlB,GAHAC,KAAKD,QAAUX,EAAMa,MAAOF,MAC5BC,KAAKE,WAAYF,KAAKG,aAEjBI,OAAOS,KAAKC,KAAOV,OAAOO,OAAOC,cAAgB,CAClD,GAAII,GAAc,GAAI9B,GAAM+B,YACxBC,YAActB,EAAQsB,YACtBC,WAAcvB,EAAQuB,WACtBC,QAAc,IAEdC,EAAQ,GAAInC,GAAMoC,eAAgB1B,EAAQ2B,SAC1CC,EAAa,GAAItC,GAAMuC,WACvBT,YAAcA,EACdK,MAAcA,EACdK,OAAc9B,EAAQ+B,kBAE1BC,iBAAkB,GAAI1C,GAAM2C,eAAgBC,MAAON,IAGnDpB,OAAO2B,UAAYP,EAGfA,EAAWQ,IAAK,UAAWC,OAAS,IACpCL,gBAAgBM,SAChBrC,KAAKK,EAAG,aAAciC,QAE1BtC,KAAKuC,IAAIC,QAAST,gBAAgBQ,KAClCvC,KAAKK,EAAG,oBAAqBoC,OAAQzC,KAAK0C,eACtCC,MAAU,gBACVC,KAAU,0BAEd,KAAM,GAAIC,KAAK9C,GAAQ+C,6BAA+B,CAClD,GAAIC,GAAIhD,EAAQ+C,6BAA8BD,EAC9C7C,MAAKK,EAAG,oBAAqBoC,OAAQzC,KAAK0C,eACtCC,MAAQI,EAAEC,gBAAgBC,KAC1BL,KAAQ,mBAAqBG,EAAEG,8BAKvClD,KAAKK,EAAG,kBAAmB8C,MAAO,WACzBC,OAAOC,sBACRD,OAAOC,qBAAsBhD,EAAGL,MAAOsD,KAAM,kBAKrD/C,OAAOgD,OAAS,GAAIjE,GAAQS,GAG5BC,KAAKwD,YACDC,QACId,MAAU,QACVe,SAAYnD,OAAOgD,YAMnCb,cAAe,SAAU3C,GACrB,MAAQ,mCACkBQ,OAAOC,KAAOT,EAAQ6C,KAAO,0BAA4B7C,EAAQ4C,MAAQ,cAIvGxC,UAAW,WACP,MAAQ,6cAmBZwD,EAAahE,SAASC,KAAKC,QAC3BC,WAAY,SAASC,GACjBC,KAAKD,QAAUX,EAAMa,MAAOF,MAC5BC,KAAKE,WAAYF,KAAKG,YAGtB,IAAIyD,GAAgB,GAAIrE,GAAGsE,YACvB5C,GAAU,yBACV0B,MAAU,kBACVmB,IAAU,sBACVC,KAAU,gBACVC,QAAU,WACFC,IAAI1D,QAAU0D,IAAI1D,OAAO2D,kBACzBD,IAAI1D,OAAO2D,iBAAiBC,wBAIpCC,EAAgB,GAAI7E,GAAGsE,YACvB5C,GAAU,yBACV0B,MAAU,kBACVmB,IAAU,sBACVO,OAAU,cACVN,KAAU,YACVnB,KAAUrC,OAAOC,KAAO,yBAExB8D,EAAkB,GAAI/E,GAAGsE,YACzB5C,GAAU,4BACV0B,MAAU,qBACVmB,IAAU,sBACVC,KAAU,gBACVnB,KAAUrC,OAAOC,KAAO,yBAI5BR,MAAKwD,YACDC,QACId,MAAU,UACVmB,IAAU,uBACVJ,SAAYE,EAAeQ,EAAeE,IAE9CC,MACIT,IAAU,kCAKlBvD,OAAOiE,mBAAqBhF,EAAa4E,EAAc7B,KACnDkC,UAAelE,OAAOS,KAAKC,IAAM,QAAU,QAC3CyD,aAAenE,OAAOO,OAAO6D,0BAA4B,QAAU,QACnEnE,KAAeD,OAAOC,OAI1BD,OAAO2D,iBAAmB,GAAIzE,GAAamF,qBACvCC,GAAkB7E,KAAKuC,IACvBmC,aAAkBnE,OAAOO,OAAO6D,yBAChCG,WAAkB,cAClBC,iBAAkB,WAAY,MAAO/E,MAAKuC,IAAIa,YAElD7C,OAAO2D,iBAAiBc,oBAAqBzE,OAAO0E,YACpD1E,OAAO2D,iBAAiBgB,eAAgB3E,QACxCA,OAAO2D,iBAAiBC,sBAI5BhE,UAAW,WACP,MAAO,4DAIf,QACIgF,KAAUjE,EACVkE,OAAU1F,EACV2F,MAAU1B"} \ 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 3904f35c9d3..94746603e44 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=this.options.params;this.$("#galaxy_main").prop("src",Galaxy.root+(c.tool_id&&"tool_runner?"+$.param(c)||c.workflow_id&&"workflow/run?workflow_id="+c.workflow_id||c.m_c&&c.m_c+"/"+c.m_a||Galaxy.config.require_login&&!Galaxy.user.id&&"user/login"||"root/welcome"))},_template:function(){return'