Fix some Django 1.11 stuff
This commit is contained in:
1 parent
c1ef6f6678
commit
8fb2389d2c
3 files changed
+17
-12
No files matched your search
+5
-3
@@ -1,7 +1,9 @@
|
||||
from django.conf import settings
|
||||
from django.conf.urls import include, url
|
||||
from django.contrib import admin
|
||||
from django.contrib.auth.views import LoginView, LogoutView
|
||||
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
||||
from django.contrib.staticfiles.views import serve
|
||||
|
||||
from main import urls as main_urls
|
||||
|
||||
@@ -10,8 +12,8 @@ admin.autodiscover()
|
||||
|
||||
urlpatterns = [
|
||||
url(r'', include(main_urls)),
|
||||
url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
|
||||
url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', name='logout'),
|
||||
url(r'^accounts/login/$', LoginView.as_view(), name='django.contrib.auth.views.login'),
|
||||
url(r'^accounts/logout/$', LogoutView.as_view(), name='django.contrib.auth.views.logout'),
|
||||
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
]
|
||||
@@ -19,7 +21,7 @@ urlpatterns += staticfiles_urlpatterns()
|
||||
|
||||
if settings.DEBUG:
|
||||
urlpatterns += [
|
||||
url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
|
||||
url(r'^media/(?P<path>.*)$', serve, {
|
||||
'document_root': settings.MEDIA_ROOT,
|
||||
})
|
||||
]
|
||||
Reference in new issue
Block a user