Skip to content

Commit f5769e4

Browse files
committed
Revert "Factor settings data out of SettingsVarsDebugPanel."
This reverts commit 7e8a4e1.
1 parent 014b64c commit f5769e4

File tree

2 files changed

+5
-17
lines changed

2 files changed

+5
-17
lines changed

debug_toolbar/debug/settings_vars.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

debug_toolbar/panels/settings_vars.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
from django.conf import settings
12
from django.template.loader import render_to_string
3+
from django.views.debug import get_safe_settings
24
from django.utils.translation import ugettext_lazy as _
35
from debug_toolbar.panels import DebugPanel
4-
from debug_toolbar.debug.settings_vars import DebugSettings
6+
57

68
class SettingsVarsDebugPanel(DebugPanel):
79
"""
@@ -10,22 +12,18 @@ class SettingsVarsDebugPanel(DebugPanel):
1012
name = 'SettingsVars'
1113
has_content = True
1214

13-
def __init__(self, context={}):
14-
super(SettingsVarsDebugPanel, self).__init__(context)
15-
self.settings = DebugSettings()
16-
1715
def nav_title(self):
1816
return _('Settings')
1917

2018
def title(self):
21-
return _('Settings from <code>%s</code>') % self.settings.module_name()
19+
return _('Settings from <code>%s</code>') % settings.SETTINGS_MODULE
2220

2321
def url(self):
2422
return ''
2523

2624
def content(self):
2725
context = self.context.copy()
2826
context.update({
29-
'settings': self.settings.available_settings(),
27+
'settings': get_safe_settings(),
3028
})
3129
return render_to_string('debug_toolbar/panels/settings_vars.html', context)

0 commit comments

Comments
 (0)