renamings and fixes

galaxyproject · Oct 5, 2016 · 482e0b2 · 482e0b2
1 parent 4635ff4
commit 482e0b2
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 21 deletions.
diff --git a/config/plugins/webhooks/masthead_test/config/masthead_test.yml b/config/plugins/webhooks/masthead_test/config/masthead_test.yml
@@ -0,0 +1,5 @@
+name: masthead_test
+icon: fa-repeat
+type: masthead
+tooltip: Masthead Plugin Test
+visible: true
diff --git a/config/plugins/webhooks/phdcomics/config/phdcomics.yaml b/config/plugins/webhooks/phdcomics/config/phdcomics.yaml
@@ -1,2 +1,2 @@
 name: phdcomics
-type: toolview
+type: tools
diff --git a/config/plugins/webhooks/topbar_test/config/topbar_test.yml b/config/plugins/webhooks/topbar_test/config/topbar_test.yml
diff --git a/config/plugins/webhooks/xkcd/config/xkcd.yml b/config/plugins/webhooks/xkcd/config/xkcd.yml
@@ -1,2 +1,2 @@
 name: xkcd
-type: toolview
+type: tools
diff --git a/lib/galaxy/webhooks/__init__.py b/lib/galaxy/webhooks/__init__.py
@@ -22,22 +22,13 @@ def __init__(self, w_name, w_type, w_path):
         self.config = {}
 
     def to_dict(self):
-        res = {
+        return {
             'name': self.name,
             'type': self.type,
             'styles': self.styles,
-            'script': self.script
+            'script': self.script,
+            'config': self.config
         }
-        if self.type == 'topbar':
-            res.update({
-                'icon': self.config['icon'],
-                'url': self.config['url'] if 'url' in
-                                             self.config.keys() else '',
-                'tooltip': self.config['tooltip'] if 'tooltip' in
-                                                     self.config.keys() else '',
-                'visible': self.config['visible']
-            })
-        return res
 
 
 class WebhooksRegistry(object):

diff --git a/static/maps/mvc/webhooks.js.map b/static/maps/mvc/webhooks.js.map
diff --git a/static/scripts/mvc/webhooks.js b/static/scripts/mvc/webhooks.js