From 99231060966634ecc6ff6f78cda06a42083f0a4d Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Sun, 11 Feb 2018 10:35:30 +0100 Subject: [PATCH] remove django widget tweaks add debug_toolbar --- caromserver/settings.py | 5 ++++- caromserver/urls.py | 7 +++++++ requirements.txt | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/caromserver/settings.py b/caromserver/settings.py index 4bcc284..ac8d0f0 100644 --- a/caromserver/settings.py +++ b/caromserver/settings.py @@ -37,14 +37,15 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'rest_framework', 'rest_framework.authtoken', + 'debug_toolbar', 'crispy_forms', - 'widget_tweaks', 'billard', ] MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'debug_toolbar.middleware.DebugToolbarMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', @@ -161,6 +162,8 @@ URL_LOCATION_PROCESSOR = 'http://127.0.0.1:8000/billard/process_locationdata' PRODUCT_INFO = 'CAROM-DEV' PRODUCT_VERSION = 'v 0.5.0' +INTERNAL_IPS = ['127.0.0.1'] + try: from local_settings import * except ImportError: diff --git a/caromserver/urls.py b/caromserver/urls.py index 3943f02..379f837 100644 --- a/caromserver/urls.py +++ b/caromserver/urls.py @@ -13,6 +13,7 @@ Including another URLconf 1. Import the include() function: from django.conf.urls import url, include 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ +from django.conf import settings from django.conf.urls import url, include from django.contrib import admin from django.contrib.auth import views as auth_views @@ -27,3 +28,9 @@ urlpatterns = [ url(r'^', include('django.contrib.auth.urls')), url(r'^$', RedirectView.as_view(url='billard/', permanent=False), name='index') ] + +if settings.DEBUG: + import debug_toolbar + urlpatterns = [ + url(r'^__debug__/', include(debug_toolbar.urls)), + ] + urlpatterns diff --git a/requirements.txt b/requirements.txt index e63edac..b8d4fc6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ django-crispy-forms==1.7.0 django-extensions>=1.7.0 djangorestframework>=3.6.0 requests>=2.18.0 -django-widget-tweaks==1.4.1 +django-debug-toolbar<2.0.0