Fix webhook access to masthead collection

galaxyproject · May 9, 2017 · 4c86628 · 4c86628
1 parent adc6ce5
commit 4c86628
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 37 deletions.
diff --git a/client/galaxy/scripts/layout/menu.js b/client/galaxy/scripts/layout/menu.js
@@ -8,6 +8,7 @@ var Collection = Backbone.Collection.extend({
         }
     }),
     fetch: function( options ){
+        var self = this;
         options = options || {};
         this.reset();
 
@@ -117,25 +118,13 @@ var Collection = Backbone.Collection.extend({
                     $.each(webhooks.models, function(index, model) {
                         var webhook = model.toJSON();
                         if (webhook.activate) {
-                            // Galaxy.page is undefined for data libraries, workflows pages
-                            if( Galaxy.page ) {
-                                Galaxy.page.masthead.collection.add({
-                                    id      : webhook.name,
-                                    icon    : webhook.config.icon,
-                                    url     : webhook.config.url,
-                                    tooltip : webhook.config.tooltip,
-                                    onclick : webhook.config.function && new Function(webhook.config.function),
-                                });
-                            }
-                            else if( Galaxy.masthead ) {
-                                Galaxy.masthead.collection.add({
-                                    id      : webhook.name,
-                                    icon    : webhook.config.icon,
-                                    url     : webhook.config.url,
-                                    tooltip : webhook.config.tooltip,
-                                    onclick : webhook.config.function && new Function(webhook.config.function),
-                                });
-                            }
+                            self.add({
+                                id      : webhook.name,
+                                icon    : webhook.config.icon,
+                                url     : webhook.config.url,
+                                tooltip : webhook.config.tooltip,
+                                onclick : webhook.config.function && new Function(webhook.config.function),
+                            });
                         }
                     });
                 });