Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update login views for Django 2

Scott Peshak1401c62e03cd
diff --git a/wger/core/urls.py b/wger/core/urls.py
index 1b74339e4..e61913e17 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -102,27 +102,27 @@ patterns_user = [
# Password reset is implemented by Django, no need to cook our own soup here
# (besides the templates)
url(r'^password/change$',
- views.password_change,
+ views.PasswordChangeView.as_view(success_url=reverse_lazy('core:user:preferences')),
{'template_name': 'user/change_password.html',
'post_change_redirect': reverse_lazy('core:user:preferences')},
name='change-password'),
url(r'^password/reset/$',
- views.password_reset,
+ views.PasswordResetView.as_view(),
{'template_name': 'user/password_reset_form.html',
'email_template_name': 'user/password_reset_email.html',
'post_reset_redirect': reverse_lazy('core:user:password_reset_done')},
name='password_reset'),
url(r'^password/reset/done/$',
- views.password_reset_done,
+ views.PasswordResetDoneView.as_view(),
{'template_name': 'user/password_reset_done.html'},
name='password_reset_done'),
url(r'^password/reset/check/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',
- views.password_reset_confirm,
+ views.PasswordResetConfirmView.as_view(),
{'template_name': 'user/password_reset_confirm.html',
'post_reset_redirect': reverse_lazy('core:user:password_reset_complete')},
name='password_reset_confirm'),
url(r'^password/reset/complete/$',
- views.password_reset_complete,
+ views.PasswordResetCompleteView.as_view(),
{'template_name': 'user/password_reset_complete.html'},
name='password_reset_complete'),
]
@@ -203,7 +203,7 @@ urlpatterns = [
misc.FeedbackClass.as_view(),
name='feedback'),
- url(r'^language/', include(patterns_language, namespace="language")),
+ url(r'^language/', include((patterns_language, namespace="language")),
url(r'^user/', include(patterns_user, namespace="user")),
url(r'^license/', include(patterns_license, namespace="license")),
url(r'^repetition-unit/', include(patterns_repetition_units, namespace="repetition-unit")),
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 47d185eb9..92020ba41 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -31,7 +31,7 @@ from django.contrib.auth.mixins import (
PermissionRequiredMixin
)
from django.contrib.auth.models import User
-from django.contrib.auth.views import login as django_loginview
+from django.contrib.auth import login as django_loginview
from django.urls import reverse
from django.http import (
HttpResponseForbidden,