From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sun, 29 Oct 2017 17:00:11 +0000 (+0100)
Subject: hijack-admin in debug mode only
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=94bbfc3426cf87abbbdd9d3bec0f9607f161e5e3;p=mezzo.git

hijack-admin in debug mode only
---

diff --git a/app/settings.py b/app/settings.py
index 88ee28ed..7aa19af2 100644
--- 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 7b60ab64..92bd156a 160000
--- a/lib/mezzanine-organization
+++ b/lib/mezzanine-organization
@@ -1 +1 @@
-Subproject commit 7b60ab6444df2e4fb4d06e8f40f6fb882082aecb
+Subproject commit 92bd156aae1bdfe20afaf231182d39d4b2f7ed89