fnp
/
cas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Password reset, standardize some stuff.
[cas.git]
/
src
/
cas
/
urls.py
diff --git
a/src/cas/urls.py
b/src/cas/urls.py
index
5b67eb1
..
297b82b
100644
(file)
--- a/
src/cas/urls.py
+++ b/
src/cas/urls.py
@@
-1,28
+1,29
@@
-# -*- coding: utf-8 -*-
-from django.conf.urls import include, patterns, url
+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.views.generic import RedirectView
from django.contrib import admin
from django.conf import settings
admin.autodiscover()
-urlpatterns =
patterns('',
-
url(r'^$', RedirectView.as_view(url='/accounts/'
)),
+urlpatterns =
[
+
path('', RedirectView.as_view(url='/accounts/', permanent=False
)),
# django-cas-provider
# django-cas-provider
-
url(r'^
cas/', include('cas_provider.urls')),
+
path('
cas/', include('cas_provider.urls')),
# Admin panel
# Admin panel
-
url(r'^
admin/doc/', include('django.contrib.admindocs.urls')),
-
url(r'^admin/', include(admin.site.urls)
),
+
path('
admin/doc/', include('django.contrib.admindocs.urls')),
+
path('admin/', admin.site.urls
),
- url(r'^accounts/', include('accounts.urls')),
-)
+ path('accounts/', include('accounts.urls')),
+ path('auth/', include('django.contrib.auth.urls')),
+]
if settings.DEBUG:
if settings.DEBUG:
- urlpatterns += patterns('',
- url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+ from django.views.static import serve
+ urlpatterns += [
+ path('media/<path>', serve, {
'document_root': settings.MEDIA_ROOT,
}),
'document_root': settings.MEDIA_ROOT,
}),
- )
+ ]