]> git.parisson.com Git - mezzo.git/commitdiff
Fix debug_toolbar loading, update submodules
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 19 Feb 2018 10:13:03 +0000 (11:13 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 19 Feb 2018 10:13:03 +0000 (11:13 +0100)
app/settings.py
app/urls.py
bin
lib/mezzanine-organization
lib/mezzanine-organization-themes

index 650d0ff2d0703c71123bd21b6e5726c86c3efb46..1cef7f9f820f2bcd8db856b1a6d4444ab268365d 100644 (file)
@@ -589,6 +589,10 @@ OPTIONAL_APPS = (
 
 if DEBUG:
     OPTIONAL_APPS += ('debug_toolbar', 'hijack_admin',)
+    MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+    print(MIDDLEWARE_CLASSES)
+
+INTERNAL_IPS = ['127.0.0.1', '172.17.0.1']
 
 DEBUG_TOOLBAR_PATCH_SETTINGS = False
 DEBUG_TOOLBAR_PANELS = [
@@ -698,4 +702,3 @@ except ImportError:
     pass
 else:
     set_dynamic_settings(globals())
-
index ade4d7d166bd1942e31b9951f103028f6f1de395..5992a830d0d56522ae5391717de40118ed6c3c9a 100644 (file)
@@ -226,4 +226,4 @@ if "mezzanine.pages" in settings.INSTALLED_APPS:
 # pages can use JS, CSS and images.
 handler404 = "mezzanine.core.views.page_not_found"
 handler500 = "mezzanine.core.views.server_error"
-handler403 = "organization.core.views.permission_denied"
\ No newline at end of file
+handler403 = "organization.core.views.permission_denied"
diff --git a/bin b/bin
index 9d20dcaf70280a8bf87e35bb98cfe36bc9d9e2d5..f7c456316eb03476bdf4aae2abfcf0f974a49ed3 160000 (submodule)
--- a/bin
+++ b/bin
@@ -1 +1 @@
-Subproject commit 9d20dcaf70280a8bf87e35bb98cfe36bc9d9e2d5
+Subproject commit f7c456316eb03476bdf4aae2abfcf0f974a49ed3
index 1448d41fda78c0944b8d6ee6ce0fdabe9917c9e0..c161c0d8f701d40e77119bf37c3e2812b6ba8438 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1448d41fda78c0944b8d6ee6ce0fdabe9917c9e0
+Subproject commit c161c0d8f701d40e77119bf37c3e2812b6ba8438
index 684b6fc88f4e1e1dd6ec01227652322283315661..fad74f440d77060d0d6a3a788dc9347c52a8ffda 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 684b6fc88f4e1e1dd6ec01227652322283315661
+Subproject commit fad74f440d77060d0d6a3a788dc9347c52a8ffda