diff options
Diffstat (limited to 'debug_toolbar/settings.py')
| -rw-r--r-- | debug_toolbar/settings.py | 19 | 
1 files changed, 18 insertions, 1 deletions
| diff --git a/debug_toolbar/settings.py b/debug_toolbar/settings.py index 48649fd..2d02aa5 100644 --- a/debug_toolbar/settings.py +++ b/debug_toolbar/settings.py @@ -16,6 +16,7 @@ from django.utils import six  CONFIG_DEFAULTS = {      # Toolbar options +    'DEFAULT_DISABLED_PANELS': ('RedirectsPanel', ),      'INSERT_BEFORE': '</body>',      'RENDER_PANELS': None,      'RESULTS_STORE_SIZE': 10, @@ -32,7 +33,6 @@ CONFIG_DEFAULTS = {          'debug_toolbar',          'django',      ), -    'INTERCEPT_REDIRECTS': False,      'SHOW_TEMPLATE_CONTEXT': True,      'SQL_WARNING_THRESHOLD': 500,   # milliseconds  } @@ -125,6 +125,23 @@ else:              PANELS[index] = new_panel +if 'INTERCEPT_REDIRECTS' in USER_CONFIG: +    warnings.warn( +        "INTERCEPT_REDIRECTS is deprecated. Please use the " +        "DEFAULT_DISABLED_PANELS config in the" +        "DEBUG_TOOLBAR_CONFIG setting.", DeprecationWarning) +    if USER_CONFIG['INTERCEPT_REDIRECTS']: +        if 'RedirectsPanel' in CONFIG['DEFAULT_DISABLED_PANELS']: +            # RedirectsPanel should be enabled +            CONFIG['DEFAULT_DISABLED_PANELS'] = [ +                panel for panel in CONFIG['DEFAULT_DISABLED_PANELS'] +                if panel != "RedirectsPanel" +            ] +    elif not 'RedirectsPanel' in CONFIG['DEFAULT_DISABLED_PANELS']: +        # RedirectsPanel should be disabled +        CONFIG['DEFAULT_DISABLED_PANELS'].append('RedirectsPanel') + +  PATCH_SETTINGS = getattr(settings, 'DEBUG_TOOLBAR_PATCH_SETTINGS', settings.DEBUG) | 
