Skip to content

Commit 7e8a4e1

Browse files
committed
Factor settings data out of SettingsVarsDebugPanel.
1 parent 4326cbb commit 7e8a4e1

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

debug_toolbar/debug/settings_vars.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
from django.conf import settings
2+
from django.views.debug import get_safe_settings
3+
4+
class DebugSettings(object):
5+
6+
def module_name(self):
7+
return settings.SETTINGS_MODULE
8+
9+
def available_settings(self):
10+
return get_safe_settings()

debug_toolbar/panels/settings_vars.py

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

86
class SettingsVarsDebugPanel(DebugPanel):
97
"""
@@ -12,18 +10,22 @@ class SettingsVarsDebugPanel(DebugPanel):
1210
name = 'SettingsVars'
1311
has_content = True
1412

13+
def __init__(self, context={}):
14+
super(SettingsVarsDebugPanel, self).__init__(context)
15+
self.settings = DebugSettings()
16+
1517
def nav_title(self):
1618
return _('Settings')
1719

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

2123
def url(self):
2224
return ''
2325

2426
def content(self):
2527
context = self.context.copy()
2628
context.update({
27-
'settings': get_safe_settings(),
29+
'settings': self.settings.available_settings(),
2830
})
2931
return render_to_string('debug_toolbar/panels/settings_vars.html', context)

0 commit comments

Comments
 (0)