Merge pull request #5521 from martenson/webhooks-galaxy-only

[18.01] disable loading of webhooks in TS and reports apps
This commit is contained in:
Dannon Baker
2018-02-14 06:37:20 -05:00
committed by GitHub
+14 -12
View File
@@ -179,18 +179,20 @@ $(document).ready(() => {
function onloadWebhooks() {
if (Galaxy.root !== undefined) {
// Load all webhooks with the type 'onload'
Webhooks.load({
type: "onload",
callback: function(webhooks) {
webhooks.each(model => {
var webhook = model.toJSON();
if (webhook.activate && webhook.script) {
Utils.appendScriptStyle(webhook);
}
});
}
});
if (Galaxy.config.enable_webhooks) {
// Load all webhooks with the type 'onload'
Webhooks.load({
type: "onload",
callback: function(webhooks) {
webhooks.each(model => {
var webhook = model.toJSON();
if (webhook.activate && webhook.script) {
Utils.appendScriptStyle(webhook);
}
});
}
});
}
} else {
setTimeout(onloadWebhooks, 100);
}