fnp
/
cas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Templates.
[cas.git]
/
src
/
cas
/
urls.py
diff --git
a/src/cas/urls.py
b/src/cas/urls.py
index
f1aeca6
..
2d44e70
100644
(file)
--- a/
src/cas/urls.py
+++ b/
src/cas/urls.py
@@
-1,17
+1,29
@@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
-from django.conf.urls.defaults import *
+from django.urls import path, include
+from django.views.generic import RedirectView
from django.contrib import admin
from django.conf import settings
admin.autodiscover()
from django.contrib import admin
from django.conf import settings
admin.autodiscover()
-urlpatterns = patterns('',
- # Admin panel
- url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
- url(r'^admin/(.*)', admin.site.root),
+urlpatterns = [
+ path('', RedirectView.as_view(url='/accounts/', permanent=False)),
# django-cas-provider
# django-cas-provider
- url(r'^', include('cas_provider.urls')),
-)
+ path('cas/', include('cas_provider.urls')),
+
+ # Admin panel
+ path('admin/doc/', include('django.contrib.admindocs.urls')),
+ path('admin/', admin.site.urls),
+
+ path('accounts/', include('accounts.urls')),
+]
+if settings.DEBUG:
+ from django.views.static import serve
+ urlpatterns += [
+ path('media/<path>', serve, {
+ 'document_root': settings.MEDIA_ROOT,
+ }),
+ ]