From bd37db9dc4587a490b8c7baefc145c67f35087c0 Mon Sep 17 00:00:00 2001
From: Matt Good <matt@matt-good.net>
Date: Wed, 6 Nov 2013 09:33:00 -0800
Subject: [PATCH] Fix SQLAlchemy URL registration

The init_app() restructuring in 356e6c removed "load_panels()", but need
to add it back so panels like SQLAlchemy can register their URLs on the
Blueprint before it's activated.
---
 flask_debugtoolbar/__init__.py |  2 ++
 flask_debugtoolbar/toolbar.py  | 27 +++++++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/flask_debugtoolbar/__init__.py b/flask_debugtoolbar/__init__.py
index 9a1cfad..8bda88e 100644
--- a/flask_debugtoolbar/__init__.py
+++ b/flask_debugtoolbar/__init__.py
@@ -69,6 +69,8 @@ class DebugToolbarExtension(object):
                 "The Flask-DebugToolbar requires the 'SECRET_KEY' config "
                 "var to be set")
 
+        DebugToolbar.load_panels(app)
+
         app.before_request(self.process_request)
         app.after_request(self.process_response)
         app.teardown_request(self.teardown_request)
diff --git a/flask_debugtoolbar/toolbar.py b/flask_debugtoolbar/toolbar.py
index 0d3a7aa..a1fba83 100644
--- a/flask_debugtoolbar/toolbar.py
+++ b/flask_debugtoolbar/toolbar.py
@@ -29,15 +29,12 @@ class DebugToolbar(object):
         activated = self.request.cookies.get('fldt_active', '')
         activated = unquote(activated).split(';')
 
-        for panel_path in current_app.config['DEBUG_TB_PANELS']:
-            panel_class = self._import_panel(panel_path)
-            if panel_class is None:
-                continue
-
+        for panel_class in self._iter_panels(current_app):
             panel_instance = panel_class(jinja_env=self.jinja_env, context=self.template_context)
 
             if panel_instance.dom_id() in activated:
                 panel_instance.is_active = True
+
             self.panels.append(panel_instance)
 
     def render_toolbar(self):
@@ -47,8 +44,22 @@ class DebugToolbar(object):
         template = self.jinja_env.get_template('base.html')
         return template.render(**context)
 
-    def _import_panel(self, path):
-        cache = self._cached_panel_classes
+    @classmethod
+    def load_panels(cls, app):
+        for panel_class in cls._iter_panels(app):
+            # just loop to make sure they've been loaded
+            pass
+
+    @classmethod
+    def _iter_panels(cls, app):
+        for panel_path in app.config['DEBUG_TB_PANELS']:
+            panel_class = cls._import_panel(app, panel_path)
+            if panel_class is not None:
+                yield panel_class
+
+    @classmethod
+    def _import_panel(cls, app, path):
+        cache = cls._cached_panel_classes
 
         try:
             return cache[path]
@@ -58,7 +69,7 @@ class DebugToolbar(object):
         try:
             panel_class = import_string(path)
         except ImportError as e:
-            current_app.logger.warning('Disabled %s due to ImportError: %s', path, e)
+            app.logger.warning('Disabled %s due to ImportError: %s', path, e)
             panel_class = None
 
         cache[path] = panel_class