From ec38c74d20606182d9b9462977e185f0c37e99b2 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Fri, 12 Sep 2008 13:34:39 -0700 Subject: Moving default list of panels into the loader to skip an install step. Panel list can still be overridden with a setting if desired. Updated README as well. --- debug_toolbar/toolbar/loader.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'debug_toolbar/toolbar') diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py index 815c7f3..67dcc3e 100644 --- a/debug_toolbar/toolbar/loader.py +++ b/debug_toolbar/toolbar/loader.py @@ -10,15 +10,29 @@ class DebugToolbar(object): self.panels = [] self.panel_list = [] self.content_list = [] + # Override this tuple by copying to settings.py as `DEBUG_TOOLBAR_PANELS` + self.default_panels = ( + 'debug_toolbar.panels.version.VersionDebugPanel', + 'debug_toolbar.panels.timer.TimerDebugPanel', + 'debug_toolbar.panels.headers.HeaderDebugPanel', + 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel', + 'debug_toolbar.panels.sql.SQLDebugPanel', + 'debug_toolbar.panels.cache.CacheDebugPanel', + 'debug_toolbar.panels.template.TemplateDebugPanel', + ) def load_panels(self): """ - Populate debug panel lists from settings.DEBUG_TOOLBAR_PANELS. + Populate debug panels """ from django.conf import settings from django.core import exceptions - for panel_path in settings.DEBUG_TOOLBAR_PANELS: + # Check if settings has a DEBUG_TOOLBAR_PANELS, otherwise use default + if hasattr(settings, 'DEBUG_TOOLBAR_PANELS'): + self.default_panels = settings.DEBUG_TOOLBAR_PANELS + + for panel_path in self.default_panels: try: dot = panel_path.rindex('.') except ValueError: -- cgit v1.2.3 From 7e27e62a690e98150f2294ff8f3aa7e43fc83e9c Mon Sep 17 00:00:00 2001 From: nbstrite Date: Tue, 16 Sep 2008 21:53:44 -0400 Subject: Fixed bug where django application was assumed to installed at / url. --- debug_toolbar/toolbar/loader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debug_toolbar/toolbar') diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py index 67dcc3e..b2de90e 100644 --- a/debug_toolbar/toolbar/loader.py +++ b/debug_toolbar/toolbar/loader.py @@ -58,4 +58,4 @@ class DebugToolbar(object): """ Renders the overall Toolbar with panels inside. """ - return render_to_string('debug_toolbar/base.html', {'panels': self.panels}) + return render_to_string('debug_toolbar/base.html', {'panels': self.panels, 'base_url': self.request.META.get('SCRIPT_NAME', '')}) -- cgit v1.2.3 From 455aacf49b03e9d4c5edd8e3843999cfafada563 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 16 Sep 2008 21:41:13 -0700 Subject: Minor stylistic changes. --- debug_toolbar/toolbar/loader.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debug_toolbar/toolbar') diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py index b2de90e..935f45c 100644 --- a/debug_toolbar/toolbar/loader.py +++ b/debug_toolbar/toolbar/loader.py @@ -58,4 +58,7 @@ class DebugToolbar(object): """ Renders the overall Toolbar with panels inside. """ - return render_to_string('debug_toolbar/base.html', {'panels': self.panels, 'base_url': self.request.META.get('SCRIPT_NAME', '')}) + return render_to_string('debug_toolbar/base.html', { + 'panels': self.panels, + 'BASE_URL': self.request.META.get('SCRIPT_NAME', '') + }) -- cgit v1.2.3 From 335cbb58f1681268eb61a04205b6a18f09f0a03a Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 20 Sep 2008 21:18:48 -0400 Subject: jquery now optional --- debug_toolbar/toolbar/loader.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debug_toolbar/toolbar') diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py index 935f45c..f45cbda 100644 --- a/debug_toolbar/toolbar/loader.py +++ b/debug_toolbar/toolbar/loader.py @@ -59,6 +59,5 @@ class DebugToolbar(object): Renders the overall Toolbar with panels inside. """ return render_to_string('debug_toolbar/base.html', { - 'panels': self.panels, - 'BASE_URL': self.request.META.get('SCRIPT_NAME', '') + 'panels': self.panels }) -- cgit v1.2.3 From ee810109f7dfb8c70278b5c447b4604bccc987a0 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Sun, 21 Sep 2008 22:35:15 -0700 Subject: Refactoring middleware and panels so panels have more explicit middleware-like methods to be more clear when panel processing happens. --- debug_toolbar/toolbar/loader.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debug_toolbar/toolbar') diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py index 935f45c..56da11b 100644 --- a/debug_toolbar/toolbar/loader.py +++ b/debug_toolbar/toolbar/loader.py @@ -8,8 +8,6 @@ class DebugToolbar(object): def __init__(self, request): self.request = request self.panels = [] - self.panel_list = [] - self.content_list = [] # Override this tuple by copying to settings.py as `DEBUG_TOOLBAR_PANELS` self.default_panels = ( 'debug_toolbar.panels.version.VersionDebugPanel', @@ -20,7 +18,8 @@ class DebugToolbar(object): 'debug_toolbar.panels.cache.CacheDebugPanel', 'debug_toolbar.panels.template.TemplateDebugPanel', ) - + self.load_panels() + def load_panels(self): """ Populate debug panels @@ -48,8 +47,9 @@ class DebugToolbar(object): raise exceptions.ImproperlyConfigured, 'Toolbar Panel module "%s" does not define a "%s" class' % (panel_module, panel_classname) try: - panel_instance = panel_class(self.request) + panel_instance = panel_class() except: + print panel_class raise # Bubble up problem loading panel self.panels.append(panel_instance) -- cgit v1.2.3 From c70df302e1564a7f7fe7883d3e042419ece1d9e6 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 27 Sep 2008 15:50:47 -0400 Subject: added logger panel --- debug_toolbar/toolbar/loader.py | 1 + 1 file changed, 1 insertion(+) (limited to 'debug_toolbar/toolbar') diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py index 0ac9096..e2c9793 100644 --- a/debug_toolbar/toolbar/loader.py +++ b/debug_toolbar/toolbar/loader.py @@ -17,6 +17,7 @@ class DebugToolbar(object): 'debug_toolbar.panels.sql.SQLDebugPanel', 'debug_toolbar.panels.cache.CacheDebugPanel', 'debug_toolbar.panels.template.TemplateDebugPanel', + 'debug_toolbar.panels.logger.LoggingPanel', ) self.load_panels() -- cgit v1.2.3