Do debug static media serving as per Django 1.6 docs, don't try to import DDT if it is not installed

This commit is contained in:
Roberto Rosario
2014-07-11 02:48:33 -04:00
parent 548ccda347
commit 9a05278957

View File

@@ -58,16 +58,16 @@ def handler500(request):
}))) })))
if settings.DEBUG: if settings.DEBUG:
from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.conf.urls.static import static
urlpatterns += staticfiles_urlpatterns() urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
if 'rosetta' in settings.INSTALLED_APPS: if 'rosetta' in settings.INSTALLED_APPS:
urlpatterns += patterns( urlpatterns += patterns(
'', '',
url(r'^rosetta/', include('rosetta.urls'), name='rosetta')) url(r'^rosetta/', include('rosetta.urls'), name='rosetta'))
import debug_toolbar if 'debug_toolbar' in settings.INSTALLED_APPS:
urlpatterns += patterns( import debug_toolbar
'', urlpatterns += patterns(
url(r'^__debug__/', include(debug_toolbar.urls))) '',
url(r'^__debug__/', include(debug_toolbar.urls)))