Skip to content

Commit

Permalink
Merge remote-tracking branch 'tmcgowan/frequest_943' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
dannon committed Oct 25, 2016
2 parents 05be84b + f9357ea commit 9d402ea
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 6 deletions.
30 changes: 30 additions & 0 deletions client/galaxy/scripts/mvc/tool/tool-form-base.js
Expand Up @@ -248,6 +248,36 @@ define(['utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view',
});
}

// add admin operations for tool XML reloading
if (Galaxy.user && Galaxy.user.get('is_admin')) {
menu_button.addMenu({
icon : 'fa-refresh',
title : 'Reload Tool XML',
tooltip : 'Reload tool XML file',
onclick : function() {
var modalMessage = new Ui.Modal.View();
$.ajax({
url: '/api/tools/' + options.id + '/reload',
type: "GET",
}).done(function(data){
modalMessage.show({
title : data.done ? 'Tool XML Reload' : 'Tool XML Reload Error',
body : data.done ? data.done : data.error,
buttons : { 'Close' : function() { modalMessage.hide() } }
});
window.setTimeout(function(){modalMessage.hide();}, 2000);

}).fail(function(error){
modalMessage.show({
title: "Tool XML Reload AJAX Error",
body: options.id + " " + error,
buttons : { 'Close' : function() { modalMessage.hide() } }
});
});
}
});
}

// button for version selection
if (options.requirements && options.requirements.length > 0) {
menu_button.addMenu({
Expand Down
2 changes: 1 addition & 1 deletion static/maps/mvc/tool/tool-form-base.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions static/scripts/bundled/analysis.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/analysis.bundled.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/libs.bundled.js.map

Large diffs are not rendered by default.

0 comments on commit 9d402ea

Please sign in to comment.