From 4969394a3cce550ea82d7ca7fa69e95c172f56d8 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Mon, 26 Mar 2018 13:15:09 -0400
Subject: [PATCH] Static serving of staged logos

---
 .../scripts/mvc/visualization/visualization-view.js   |  2 +-
 lib/galaxy/visualization/plugins/plugin.py            | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/galaxy/scripts/mvc/visualization/visualization-view.js b/client/galaxy/scripts/mvc/visualization/visualization-view.js
index e4420a81fa9..63137e1539b 100644
--- a/client/galaxy/scripts/mvc/visualization/visualization-view.js
+++ b/client/galaxy/scripts/mvc/visualization/visualization-view.js
@@ -47,7 +47,7 @@ var View = Backbone.View.extend({
                     name: v.name,
                     keywords: v.keywords || [],
                     title: v.html,
-                    image_src: v.logo ? Galaxy.root + "static/" + v.logo : null,
+                    image_src: v.logo ? Galaxy.root + v.logo : null,
                     description: v.description || "No description available.",
                     regular: v.regular,
                     visualization: v
diff --git a/lib/galaxy/visualization/plugins/plugin.py b/lib/galaxy/visualization/plugins/plugin.py
index d58c71fc2dc..644fcec52c4 100644
--- a/lib/galaxy/visualization/plugins/plugin.py
+++ b/lib/galaxy/visualization/plugins/plugin.py
@@ -45,7 +45,7 @@ class ServesStaticPluginMixin(object):
         return os.path.join(self.path, 'static')
 
     def _build_static_url(self):
-        return '/'.join([self.base_url, 'static'])
+        return self.static_path.replace("./config", "./static")
 
 
 class ServesTemplatesPluginMixin(object):
@@ -169,12 +169,13 @@ class VisualizationPlugin(ServesStaticPluginMixin, ServesTemplatesPluginMixin):
 
     # ---- non-public
     def _check_path(self, path):
-        return os.path.exists(os.path.join(self.path, path))
+        return os.path.exists(path)
 
     def _set_up_static_images(self):
-        default_path = 'static/logo.png'
-        if self._check_path(default_path):
-            self.config['logo'] = '/'.join(['plugins', self.base_url, default_path])
+        if self.serves_static:
+            logo_path = '/'.join([self.static_url, 'logo.png'])
+            if self._check_path(logo_path):
+                self.config['logo'] = logo_path
 
     def _build_render_vars(self, config, trans=None, **kwargs):
         """