From e45daedcdd6bdb23897bedbf6c25301dd6853bc4 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 9 Aug 2017 10:06:43 +0200 Subject: [PATCH] Fix debug_toobar config against docker bridge, remove wavejs tools for now --- app/settings.py | 45 +++++++++++++++++++++++++-------------------- lib/TimeSide | 2 +- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/app/settings.py b/app/settings.py index 37eef63e..62e73c64 100644 --- a/app/settings.py +++ b/app/settings.py @@ -130,7 +130,6 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.locale.LocaleMiddleware', - 'debug_toolbar.middleware.DebugToolbarMiddleware', # 'pagination.middleware.PaginationMiddleware', ) @@ -162,7 +161,6 @@ INSTALLED_APPS = ( 'jqchat', 'ipauth', 'extra_views', - 'debug_toolbar', 'bootstrap3', 'bootstrap_pagination', 'googletools', @@ -243,28 +241,35 @@ PAGINATION_SETTINGS = { 'PAGE_RANGE_DISPLAYED': 10, 'MARGIN_PAGES_DISPLAYED': 2, } + if DEBUG: + INSTALLED_APPS += ('debug_toolbar',) + MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) DEBUG_TOOLBAR_CONFIG = { 'SHOW_TOOLBAR_CALLBACK': lambda x : True } -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', -] + 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', + ] + DEBUG_TOOLBAR_CONFIG = { + 'JQUERY_URL': '/static/jquery/dist/jquery.min.js', + } + INTERNAL_IPS = ['127.0.0.1', '0.0.0.0', '172.17.0.1'] SUIT_CONFIG = { - 'ADMIN_NAME': 'Telemeta Admin' + 'ADMIN_NAME': 'Telemeta Admin' } # A sample logging configuration. The only tangible logging @@ -351,10 +356,10 @@ BOWER_INSTALLED_APPS = ( 'angular-resource#1.2.26', 'raphael#2.2.7', 'soundmanager#V2.97a.20150601', - 'https://github.com/Parisson/loaders.git', - 'https://github.com/Parisson/ui.git', 'jquery-ui#1.11.4', 'tablesorter', 'video.js', 'sass-bootstrap-glyphicons', + # 'https://github.com/Parisson/loaders.git', + # 'https://github.com/Parisson/ui.git', ) diff --git a/lib/TimeSide b/lib/TimeSide index 98e93ee2..25bc6073 160000 --- a/lib/TimeSide +++ b/lib/TimeSide @@ -1 +1 @@ -Subproject commit 98e93ee2269c22d0b59da444f644407921b63a25 +Subproject commit 25bc60736669532d72796d28c9204c0aa54241d1 -- 2.39.5