X-Git-Url: https://git.mdrn.pl/cas.git/blobdiff_plain/37e278e43ece42375352c07d9f04991ef58d992c..1c1998bd8961dbe721b9e133811678c92fd3c685:/src/cas/urls.py diff --git a/src/cas/urls.py b/src/cas/urls.py index 4a285fd..9db4e41 100644 --- a/src/cas/urls.py +++ b/src/cas/urls.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -from django.conf.urls.defaults import * -from django.views.generic.simple import redirect_to +from django.conf.urls import include, url +from django.views.generic import RedirectView from django.contrib import admin from django.conf import settings admin.autodiscover() -urlpatterns = patterns('', - url(r'^$', redirect_to, {'url': '/accounts/'}), +urlpatterns = [ + url(r'^$', RedirectView.as_view(url='/accounts/', permanent=False)), # django-cas-provider url(r'^cas/', include('cas_provider.urls')), @@ -17,9 +17,13 @@ urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), url(r'^accounts/', include('accounts.urls')), - - url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', - {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), -) +] +if settings.DEBUG: + from django.views.static import serve + urlpatterns += [ + url(r'^media/(?P.*)$', serve, { + 'document_root': settings.MEDIA_ROOT, + }), + ]