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

[18.01] disable loading of webhooks in TS and reports apps
galaxyproject · Feb 14, 2018 · adaacbc · adaacbc
2 parents ed23cc6 + b9ddec7
commit adaacbc
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/client/galaxy/scripts/onload.js b/client/galaxy/scripts/onload.js
@@ -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);
         }