Clean up DebugToolbar class, especially panels handling.

2 files changed, 6 insertions, 4 deletions

diff --git a/debug_toolbar/panels/__init__.py b/debug_toolbar/panels/__init__.py
index d64aac2..37d7eb7 100644
--- a/debug_toolbar/panels/__init__.py
+++ b/debug_toolbar/panels/__init__.py
@@ -31,11 +31,13 @@ class DebugPanel(object):
             context.update(self.get_stats())
             return render_to_string(self.template, context)
 
-    def dom_id(self):
-        return 'djDebug%sPanel' % (self.name.replace(' ', ''))
+    @property
+    def panel_id(self):
+        return self.__class__.__name__
 
+    @property
     def enabled(self):
-        return self.toolbar.request.COOKIES.get(self.dom_id(), 'on') == 'on'
+        return self.toolbar.request.COOKIES.get('djdt' + self.panel_id, 'on') == 'on'
 
     # URLs for panel-specific views
 
diff --git a/debug_toolbar/panels/redirects.py b/debug_toolbar/panels/redirects.py
index 244f7ed..22add70 100644
--- a/debug_toolbar/panels/redirects.py
+++ b/debug_toolbar/panels/redirects.py
@@ -18,7 +18,7 @@ class InterceptRedirectsPanel(DebugPanel):
 
     def enabled(self):
         default = 'on' if self.toolbar.config['INTERCEPT_REDIRECTS'] else 'off'
-        return self.toolbar.request.COOKIES.get(self.dom_id(), default) == 'on'
+        return self.toolbar.request.COOKIES.get('djdt' + self.panel_id, default) == 'on'
 
     def process_response(self, request, response):
         if isinstance(response, HttpResponseRedirect):