From 9a05278957508fc72991036f7d5b3895a03a2a3c Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 11 Jul 2014 02:48:33 -0400 Subject: [PATCH] Do debug static media serving as per Django 1.6 docs, don't try to import DDT if it is not installed --- mayan/urls.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mayan/urls.py b/mayan/urls.py index 013af06664..2b5753c28a 100644 --- a/mayan/urls.py +++ b/mayan/urls.py @@ -58,16 +58,16 @@ def handler500(request): }))) if settings.DEBUG: - from django.contrib.staticfiles.urls import staticfiles_urlpatterns - urlpatterns += staticfiles_urlpatterns() + from django.conf.urls.static import static + urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) if 'rosetta' in settings.INSTALLED_APPS: urlpatterns += patterns( '', url(r'^rosetta/', include('rosetta.urls'), name='rosetta')) - import debug_toolbar - urlpatterns += patterns( - '', - url(r'^__debug__/', include(debug_toolbar.urls))) - + if 'debug_toolbar' in settings.INSTALLED_APPS: + import debug_toolbar + urlpatterns += patterns( + '', + url(r'^__debug__/', include(debug_toolbar.urls)))