bug fixes and improvements

client/galaxy/scripts/mvc/history/options-menu.js

@@ -169,30 +169,9 @@ var menu = [
     }
 ];
 
-
 // Webhooks
+Webhooks.addToHistoryMenu(_l, menu);
 
-var webhooks = new Webhooks.Webhooks();
-webhooks.url = Galaxy.root + 'api/webhooks/history-menu/all';
-webhooks.fetch({
-    async: false,   // slows down History Panel loading
-    success: function() {
-        if (webhooks.length > 0) {
-            menu.push({
-                html   : _l( 'Webhooks' ),
-                header : true
-            });
-
-            $.each(webhooks.models, function(index, model) {
-                var webhook = model.toJSON();
-                menu.push({
-                    html : _l( webhook.config.title ),
-                    anon : true
-                });
-            });
-        }
-    }
-});
 
 function buildMenu( isAnon, purgeAllowed, urlRoot ){
     return _.clone( menu ).filter( function( menuOption ){

config/plugins/webhooks/history_test1/config/history_test1.yml

@@ -2,3 +2,4 @@ name: history_test1
 title: History Menu Webhook Item 1
 type: 
   - history-menu
+activate: false

config/plugins/webhooks/history_test2/config/history_test2.yml

@@ -2,3 +2,4 @@ name: history_test2
 title: History Menu Webhook Item 2
 type: 
   - history-menu
+activate: false

config/plugins/webhooks/masthead_test/config/masthead_test.yml

@@ -1,6 +1,8 @@
 name: masthead_test
-icon: fa-repeat
 type: 
   - masthead
+activate: false
+
+icon: fa-repeat
 tooltip: Masthead Plugin Test
-activate: true
+

config/plugins/webhooks/phdcomics/config/phdcomics.yaml

@@ -1,4 +1,5 @@
 name: phdcomics
 type:
-  - tools
+  - tool
   - workflow
+activate: false

config/plugins/webhooks/xkcd/config/xkcd.yml

@@ -1,4 +1,5 @@
 name: xkcd
 type:
-  - tools
+  - tool
   - workflow
+activate: true

lib/galaxy/webhooks/__init__.py

@@ -12,9 +12,10 @@
 
 
 class Webhook(object):
-    def __init__(self, w_name, w_type, w_path):
+    def __init__(self, w_name, w_type, w_activate, w_path):
         self.name = w_name
         self.type = w_type
+        self.activate = w_activate
         self.path = w_path
         self.styles = ''
         self.script = ''
@@ -25,6 +26,7 @@ def to_dict(self):
         return {
             'name': self.name,
             'type': self.type,
+            'activate': self.activate,
             'styles': self.styles,
             'script': self.script,
             'config': self.config
@@ -63,7 +65,12 @@ def load_webhook_from_config(self, config_dir, config_file):
             with open(os.path.join(config_dir, config_file)) as file:
                 config = yaml.load(file)
                 path = os.path.normpath(os.path.join(config_dir, '..'))
-                webhook = Webhook(config['name'], config['type'], path)
+                webhook = Webhook(
+                    config['name'],
+                    config['type'],
+                    config['activate'],
+                    path,
+                )
 
                 # Read styles into a string, assuming all styles are in a
                 # single file