technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-11 09:22:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to django 2.1

Browse Source
This commit is contained in:
Daan Sprenkels
2018-08-16 15:09:55 +02:00
parent 91b0ed7fcf
commit 3f22056157
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
marietje/marietje/urls.py
View File

@ -15,17 +15,17 @@ Including another URLconf
""" """
from django.conf.urls import include, url from django.conf.urls import include, url
from django.contrib import admin from django.contrib import admin
from django.contrib.auth.views import LoginView, LogoutView
from metrics.views import metrics from metrics.views import metrics
from queues.views import index from queues.views import index
from django.contrib.auth.views import login, logout
from .views import register, activate, forgotpassword, resetpassword from .views import register, activate, forgotpassword, resetpassword
from .forms import AuthenticationForm from .forms import AuthenticationForm
urlpatterns = [ urlpatterns = [
url(r'^$', index, name='index'), url(r'^$', index, name='index'),
url(r'^login/$', login, {'authentication_form': AuthenticationForm}, name='login'), url(r'^login/$', LoginView.as_view(authentication_form=AuthenticationForm), name='login'),
url(r'^logout/$', logout, name='logout'), url(r'^logout/$', LogoutView.as_view(), name='logout'),
url(r'^register/$', register, name='register'), url(r'^register/$', register, name='register'),
url(r'^activate/(\d+)/(\w+)/$', activate, name='activate'), url(r'^activate/(\d+)/(\w+)/$', activate, name='activate'),
url(r'^forgotpassword/$', forgotpassword, name='forgotpassword'), url(r'^forgotpassword/$', forgotpassword, name='forgotpassword'),