Merge pull request #3204 from galaxyproject/release_16.10

Merge release_16.10 into dev
This commit is contained in:
Martin Cech
2016-11-21 14:40:05 -05:00
committed by GitHub
14 changed files with 48 additions and 45 deletions
-1
View File
@@ -31,7 +31,6 @@ window.app = function app( options, bootstrapped ){
toolPanel = new ToolPanel({
el : '#left',
userIsAnonymous : Galaxy.user.isAnonymous(),
search_url : config.search_url,
toolbox : config.toolbox,
toolbox_in_panel : config.toolbox_in_panel,
stored_workflow_menu_entries : config.stored_workflow_menu_entries,
+1 -2
View File
@@ -17,7 +17,6 @@ var ToolPanel = LeftPanel.extend({
// create tool search, tool panel, and tool panel view.
var tool_search = new Tools.ToolSearch({
search_url : options.search_url,
hidden : false
});
var tools = new Tools.ToolCollection( options.toolbox );
@@ -112,4 +111,4 @@ var ToolPanel = LeftPanel.extend({
toString : function(){ return 'ToolPanel'; }
});
module.exports = ToolPanel;
module.exports = ToolPanel;
@@ -60,15 +60,23 @@ var menu = [
},
{
html : _l( 'Delete' ),
confirm : _l( 'Really delete the current history?' ),
href : 'history/delete_current',
anon : true,
func : function() {
if( Galaxy && Galaxy.currHistoryPanel && confirm( _l( 'Really delete the current history?' ) ) ){
galaxy_main.window.location.href = 'history/delete?id=' + Galaxy.currHistoryPanel.model.id;
}
},
},
{
html : _l( 'Delete Permanently' ),
confirm : _l( 'Really delete the current history permanently? This cannot be undone.' ),
href : 'history/delete_current?purge=True',
purge : true,
anon : true,
func : function() {
if( Galaxy && Galaxy.currHistoryPanel
&& confirm( _l( 'Really delete the current history permanently? This cannot be undone.' ) ) ){
galaxy_main.window.location.href = 'history/delete?purge=True&id=' + Galaxy.currHistoryPanel.model.id;
}
},
},
-1
View File
@@ -351,7 +351,6 @@ var ToolSearch = Backbone.Model.extend({
search_hint_string: "search tools",
min_chars_for_search: 3,
clear_btn_url: "",
search_url: "",
visible: true,
query: "",
results: null,
@@ -53,7 +53,6 @@ class RootController( controller.JSAppLauncher, UsesAnnotations ):
'active_view' : 'analysis',
'params' : dict( trans.request.params ),
'enable_cloud_launch' : app.config.get_bool( 'enable_cloud_launch', False ),
'search_url' : web.url_for( controller='root', action='tool_search' ),
# TODO: next two should be redundant - why can't we build one from the other?
'toolbox' : app.toolbox.to_dict( trans, in_panel=False ),
'toolbox_in_panel' : app.toolbox.to_dict( trans ),
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"options-menu.js","sources":["../../../src/mvc/history/options-menu.js"],"names":["define","PopupMenu","historyCopyDialog","BASE_MVC","_l","Webhooks","buildMenu","isAnon","purgeAllowed","urlRoot","_","clone","menu","filter","menuOption","anon","purge","href","target","confirm","func","galaxy_main","location","html","header","Galaxy","currHistoryPanel","createNewHistory","model","done","loadCurrentHistory","collapseAll","filtered","contents","hidden","ajaxQueue","Backbone","Model","prototype","save","visible","renderItems","fail","alert","console","error","arguments","deleted","add","url","async","callback","webhooks","webhooks_menu","$","each","models","index","webhook","toJSON","activate","push","config","title","length","unshift","merge","create","$button","options","undefined","anonymous","root"],"mappings":"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"}
{"version":3,"file":"options-menu.js","sources":["../../../src/mvc/history/options-menu.js"],"names":["define","PopupMenu","historyCopyDialog","BASE_MVC","_l","Webhooks","buildMenu","isAnon","purgeAllowed","urlRoot","_","clone","menu","filter","menuOption","anon","purge","href","target","confirm","func","galaxy_main","location","html","header","Galaxy","currHistoryPanel","createNewHistory","model","done","loadCurrentHistory","window","id","collapseAll","filtered","contents","hidden","ajaxQueue","Backbone","Model","prototype","save","visible","renderItems","fail","alert","console","error","arguments","deleted","add","url","async","callback","webhooks","webhooks_menu","$","each","models","index","webhook","toJSON","activate","push","config","title","length","unshift","merge","create","$button","options","undefined","anonymous","root"],"mappings":"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"}
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
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1,2 +1,2 @@
define(["mvc/ui/popup-menu","mvc/history/copy-dialog","mvc/base-mvc","utils/localization","mvc/webhooks"],function(a,b,c,d,e){"use strict";function f(a,b,c){return _.clone(g).filter(function(d){return a&&!d.anon?!1:!b&&d.purge?!1:(d.href&&(d.href=c+d.href,d.target="galaxy_main"),d.confirm&&(d.func=function(){confirm(d.confirm)&&(galaxy_main.location=d.href)}),!0)})}var g=[{html:d("History Lists"),header:!0},{html:d("Saved Histories"),href:"history/list"},{html:d("Histories Shared with Me"),href:"history/list_shared"},{html:d("History Actions"),header:!0,anon:!0},{html:d("Create New"),func:function(){Galaxy&&Galaxy.currHistoryPanel&&Galaxy.currHistoryPanel.createNewHistory()}},{html:d("Copy History"),func:function(){b(Galaxy.currHistoryPanel.model).done(function(){Galaxy.currHistoryPanel.loadCurrentHistory()})}},{html:d("Share or Publish"),href:"history/sharing"},{html:d("Show Structure"),href:"history/display_structured",anon:!0},{html:d("Extract Workflow"),href:"workflow/build_from_current_history"},{html:d("Delete"),confirm:d("Really delete the current history?"),href:"history/delete_current"},{html:d("Delete Permanently"),confirm:d("Really delete the current history permanently? This cannot be undone."),href:"history/delete_current?purge=True",purge:!0,anon:!0},{html:d("Dataset Actions"),header:!0,anon:!0},{html:d("Copy Datasets"),href:"dataset/copy_datasets"},{html:d("Dataset Security"),href:"root/history_set_default_permissions"},{html:d("Resume Paused Jobs"),href:"history/resume_paused_jobs?current=True",anon:!0},{html:d("Collapse Expanded Datasets"),func:function(){Galaxy&&Galaxy.currHistoryPanel&&Galaxy.currHistoryPanel.collapseAll()}},{html:d("Unhide Hidden Datasets"),anon:!0,func:function(){if(Galaxy&&Galaxy.currHistoryPanel&&confirm(d("Really unhide all hidden datasets?"))){var a=Galaxy.currHistoryPanel.model.contents.hidden();a.ajaxQueue(Backbone.Model.prototype.save,{visible:!0}).done(function(){Galaxy.currHistoryPanel.renderItems()}).fail(function(){alert("There was an error unhiding the datasets"),console.error(arguments)})}}},{html:d("Delete Hidden Datasets"),anon:!0,func:function(){if(Galaxy&&Galaxy.currHistoryPanel&&confirm(d("Really delete all hidden datasets?"))){var a=Galaxy.currHistoryPanel.model.contents.hidden();a.ajaxQueue(Backbone.Model.prototype.save,{deleted:!0,visible:!0}).done(function(){Galaxy.currHistoryPanel.renderItems()}).fail(function(){alert("There was an error deleting the datasets"),console.error(arguments)})}}},{html:d("Purge Deleted Datasets"),confirm:d("Really delete all deleted datasets permanently? This cannot be undone."),href:"history/purge_deleted_datasets",purge:!0,anon:!0},{html:d("Downloads"),header:!0},{html:d("Export Tool Citations"),href:"history/citations",anon:!0},{html:d("Export History to File"),href:"history/export_archive?preview=True",anon:!0},{html:d("Other Actions"),header:!0},{html:d("Import from File"),href:"history/import_archive"}];e.add({url:"api/webhooks/history-menu/all",async:!1,callback:function(a){var b=[];$.each(a.models,function(a,c){var e=c.toJSON();e.activate&&b.push({html:d(e.config.title),anon:!0})}),b.length>0&&(b.unshift({html:d("Webhooks"),header:!0}),$.merge(g,b))}});var h=function(b,c){c=c||{};var d=void 0===c.anonymous?!0:c.anonymous,e=c.purgeAllowed||!1,g=f(d,e,Galaxy.root);return new a(b,g)};return h});
define(["mvc/ui/popup-menu","mvc/history/copy-dialog","mvc/base-mvc","utils/localization","mvc/webhooks"],function(a,b,c,d,e){"use strict";function f(a,b,c){return _.clone(g).filter(function(d){return a&&!d.anon?!1:!b&&d.purge?!1:(d.href&&(d.href=c+d.href,d.target="galaxy_main"),d.confirm&&(d.func=function(){confirm(d.confirm)&&(galaxy_main.location=d.href)}),!0)})}var g=[{html:d("History Lists"),header:!0},{html:d("Saved Histories"),href:"history/list"},{html:d("Histories Shared with Me"),href:"history/list_shared"},{html:d("History Actions"),header:!0,anon:!0},{html:d("Create New"),func:function(){Galaxy&&Galaxy.currHistoryPanel&&Galaxy.currHistoryPanel.createNewHistory()}},{html:d("Copy History"),func:function(){b(Galaxy.currHistoryPanel.model).done(function(){Galaxy.currHistoryPanel.loadCurrentHistory()})}},{html:d("Share or Publish"),href:"history/sharing"},{html:d("Show Structure"),href:"history/display_structured",anon:!0},{html:d("Extract Workflow"),href:"workflow/build_from_current_history"},{html:d("Delete"),anon:!0,func:function(){Galaxy&&Galaxy.currHistoryPanel&&confirm(d("Really delete the current history?"))&&(galaxy_main.window.location.href="history/delete?id="+Galaxy.currHistoryPanel.model.id)}},{html:d("Delete Permanently"),purge:!0,anon:!0,func:function(){Galaxy&&Galaxy.currHistoryPanel&&confirm(d("Really delete the current history permanently? This cannot be undone."))&&(galaxy_main.window.location.href="history/delete?purge=True&id="+Galaxy.currHistoryPanel.model.id)}},{html:d("Dataset Actions"),header:!0,anon:!0},{html:d("Copy Datasets"),href:"dataset/copy_datasets"},{html:d("Dataset Security"),href:"root/history_set_default_permissions"},{html:d("Resume Paused Jobs"),href:"history/resume_paused_jobs?current=True",anon:!0},{html:d("Collapse Expanded Datasets"),func:function(){Galaxy&&Galaxy.currHistoryPanel&&Galaxy.currHistoryPanel.collapseAll()}},{html:d("Unhide Hidden Datasets"),anon:!0,func:function(){if(Galaxy&&Galaxy.currHistoryPanel&&confirm(d("Really unhide all hidden datasets?"))){var a=Galaxy.currHistoryPanel.model.contents.hidden();a.ajaxQueue(Backbone.Model.prototype.save,{visible:!0}).done(function(){Galaxy.currHistoryPanel.renderItems()}).fail(function(){alert("There was an error unhiding the datasets"),console.error(arguments)})}}},{html:d("Delete Hidden Datasets"),anon:!0,func:function(){if(Galaxy&&Galaxy.currHistoryPanel&&confirm(d("Really delete all hidden datasets?"))){var a=Galaxy.currHistoryPanel.model.contents.hidden();a.ajaxQueue(Backbone.Model.prototype.save,{deleted:!0,visible:!0}).done(function(){Galaxy.currHistoryPanel.renderItems()}).fail(function(){alert("There was an error deleting the datasets"),console.error(arguments)})}}},{html:d("Purge Deleted Datasets"),confirm:d("Really delete all deleted datasets permanently? This cannot be undone."),href:"history/purge_deleted_datasets",purge:!0,anon:!0},{html:d("Downloads"),header:!0},{html:d("Export Tool Citations"),href:"history/citations",anon:!0},{html:d("Export History to File"),href:"history/export_archive?preview=True",anon:!0},{html:d("Other Actions"),header:!0},{html:d("Import from File"),href:"history/import_archive"}];e.add({url:"api/webhooks/history-menu/all",async:!1,callback:function(a){var b=[];$.each(a.models,function(a,c){var e=c.toJSON();e.activate&&b.push({html:d(e.config.title),anon:!0})}),b.length>0&&(b.unshift({html:d("Webhooks"),header:!0}),$.merge(g,b))}});var h=function(b,c){c=c||{};var d=void 0===c.anonymous?!0:c.anonymous,e=c.purgeAllowed||!1,g=f(d,e,Galaxy.root);return new a(b,g)};return h});
//# sourceMappingURL=../../../maps/mvc/history/options-menu.js.map
File diff suppressed because one or more lines are too long