hijack-admin in debug mode only

diff --git a/app/settings.py b/app/settings.py
index 88ee28edb9929f5afe26a58c15f305c885fc30ec..7aa19af24ca3d80e8d7de38046ab67da92b4dbe7 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -261,7 +261,6 @@ INSTALLED_APPS = [
     "django_instagram",
     'hijack',
     'compat',
-    'hijack_admin',
     'guardian',
     'extra_views',
 ]
@@ -565,31 +564,24 @@ OPTIONAL_APPS = (
     PACKAGE_NAME_GRAPPELLI,
 )
 
-# if DEBUG:
-#     OPTIONAL_APPS += ("debug_toolbar",)
-#
-# DEBUG_TOOLBAR_PATCH_SETTINGS = False
-# DEBUG_TOOLBAR_PANELS = [
-#     'debug_toolbar.panels.versions.VersionsPanel',
-#     'debug_toolbar.panels.timer.TimerPanel',
-#     'debug_toolbar.panels.settings.SettingsPanel',
-#     'debug_toolbar.panels.headers.HeadersPanel',
-#     'debug_toolbar.panels.request.RequestPanel',
-#     'debug_toolbar.panels.sql.SQLPanel',
-#     'debug_toolbar.panels.staticfiles.StaticFilesPanel',
-#     'debug_toolbar.panels.templates.TemplatesPanel',
-#     'debug_toolbar.panels.cache.CachePanel',
-#     'debug_toolbar.panels.signals.SignalsPanel',
-#     'debug_toolbar.panels.logging.LoggingPanel',
-#     'debug_toolbar.panels.redirects.RedirectsPanel',
-# ]
-
 if DEBUG:
-    HIJACK_REGISTER_ADMIN = True
-    HIJACK_ALLOW_GET_REQUESTS = True
-else:
-    HIJACK_REGISTER_ADMIN = False
-    HIJACK_ALLOW_GET_REQUESTS = False
+    OPTIONAL_APPS += ('debug_toolbar', 'hijack_admin',)
+
+DEBUG_TOOLBAR_PATCH_SETTINGS = False
+DEBUG_TOOLBAR_PANELS = [
+    'debug_toolbar.panels.versions.VersionsPanel',
+    'debug_toolbar.panels.timer.TimerPanel',
+    'debug_toolbar.panels.settings.SettingsPanel',
+    'debug_toolbar.panels.headers.HeadersPanel',
+    'debug_toolbar.panels.request.RequestPanel',
+    'debug_toolbar.panels.sql.SQLPanel',
+    'debug_toolbar.panels.staticfiles.StaticFilesPanel',
+    'debug_toolbar.panels.templates.TemplatesPanel',
+    'debug_toolbar.panels.cache.CachePanel',
+    'debug_toolbar.panels.signals.SignalsPanel',
+    'debug_toolbar.panels.logging.LoggingPanel',
+    'debug_toolbar.panels.redirects.RedirectsPanel',
+]
 
 # HIJACK
 if DEBUG :

diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization
index 7b60ab6444df2e4fb4d06e8f40f6fb882082aecb..92bd156aae1bdfe20afaf231182d39d4b2f7ed89 160000 (submodule)
--- a/lib/mezzanine-organization
+++ b/lib/mezzanine-organization
@@ -1 +1 @@
-Subproject commit 7b60ab6444df2e4fb4d06e8f40f6fb882082aecb
+Subproject commit 92bd156aae1bdfe20afaf231182d39d4b2f7ed89