Merge pull request #548 from tim-schilling/disable-panels-by-default-510

Deprecating INTERCEPT_REDIRECTS in favor of DEFAULT_DISABLED_PANELS.

2 files changed, 10 insertions, 6 deletions

diff --git a/debug_toolbar/panels/__init__.py b/debug_toolbar/panels/__init__.py
index 178ea6f..a7e3528 100644
--- a/debug_toolbar/panels/__init__.py
+++ b/debug_toolbar/panels/__init__.py
@@ -4,6 +4,9 @@ import warnings
 
 from django.template.loader import render_to_string
 
+from debug_toolbar import settings as dt_settings
+from debug_toolbar.utils import get_name_from_obj
+
 
 class Panel(object):
     """
@@ -20,7 +23,13 @@ class Panel(object):
 
     @property
     def enabled(self):
-        return self.toolbar.request.COOKIES.get('djdt' + self.panel_id, 'on') == 'on'
+        # Check to see if settings has a default value for it
+        if get_name_from_obj(self) in dt_settings.CONFIG['DEFAULT_DISABLED_PANELS']:
+            default = 'off'
+        else:
+            default = 'on'
+        # The user's cookies should override the default value
+        return self.toolbar.request.COOKIES.get('djdt' + self.panel_id, default) == 'on'
 
     # Titles and content
 
diff --git a/debug_toolbar/panels/redirects.py b/debug_toolbar/panels/redirects.py
index 8bd5aba..757c65c 100644
--- a/debug_toolbar/panels/redirects.py
+++ b/debug_toolbar/panels/redirects.py
@@ -12,11 +12,6 @@ class RedirectsPanel(Panel):
     Panel that intercepts redirects and displays a page with debug info.
     """
 
-    @property
-    def enabled(self):
-        default = 'on' if self.toolbar.config['INTERCEPT_REDIRECTS'] else 'off'
-        return self.toolbar.request.COOKIES.get('djdt' + self.panel_id, default) == 'on'
-
     has_content = False
 
     nav_title = _("Intercept redirects")