Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix LoginView usage

Scott Peshak9a5662531bbf
diff --git a/wger/core/urls.py b/wger/core/urls.py
index d9a9d5c32..d47b1b5a2 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -34,6 +34,7 @@ from wger.core.views import (
weight_units
)
+from wger.core.forms import UserLoginForm
# sub patterns for languages
patterns_language = [
@@ -57,7 +58,8 @@ patterns_language = [
# sub patterns for user
patterns_user = [
url(r'^login$',
- user.login,
+ views.LoginView.as_view(template_name='user/login.html',
+ authentication_form=UserLoginForm),
name='login'),
url(r'^logout$',
user.logout,
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index ca9fa48bb..270466e3e 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 import login as django_loginview
+from django.contrib.auth.views import LoginView
from django.urls import reverse
from django.http import (
HttpResponseForbidden,
@@ -101,10 +101,9 @@ def login(request):
if request.GET.get('next'):
context['next'] = request.GET.get('next')
- return django_loginview(request,
- template_name='user/login.html',
- authentication_form=UserLoginForm,
- extra_context=context)
+ return LoginView.as_view(template_name='user/login.html',
+ authentication_form=UserLoginForm,
+ extra_context=context)
@login_required()