Print login errors, redirect to / on logout and use the Login/Logout view classes, instead of the deprecated functions

This commit is contained in:
Oliver Falk
2018-06-15 10:27:50 +02:00
parent 44124957c6
commit 4a1a249bc9
2 changed files with 15 additions and 6 deletions

View File

@@ -7,6 +7,15 @@
<h1>{% trans 'Login' %}</h1>
{% if form.errors %}
{% for error in form.non_field_errors %}
<div class="alert alert-danger">
<strong>{{ error|escape }}</strong>
</div>
{% endfor %}
{% endif %}
<form action="{% url 'login' %}" method="post" name="login">{% csrf_token %}
<table summary="">

View File

@@ -2,6 +2,9 @@ from django.urls import path
from django.conf.urls import url
from django.views.generic import TemplateView
from django.contrib.auth.views import LoginView, LogoutView
from django.contrib.auth.decorators import login_required
from . views import CreateView, PasswordSetView, AddEmailView
from . views import RemoveUnconfirmedEmailView, ConfirmEmailView
from . views import RemoveConfirmedEmailView, AssignPhotoEmailView
@@ -10,19 +13,16 @@ from . views import ImportPhotoView, RawImageView, DeletePhotoView
from . views import UploadPhotoView, AssignPhotoOpenIDView
from . views import AddOpenIDView, RedirectOpenIDView, ConfirmOpenIDView
from . views import CropPhotoView
from django.contrib.auth.views import login, logout
from django.urls import reverse_lazy
from django.contrib.auth.decorators import login_required
# Define URL patterns, self documenting
# To see the fancy, colorful evaluation of these use:
# ./manager show_urls
urlpatterns = [
path('new/', CreateView.as_view(), name='new_account'),
path('login/', login, {'template_name': 'login.html'}, name='login'),
path('login/', LoginView.as_view(template_name='login.html'),
name='login'),
path(
'logout/', logout, {'next_page': reverse_lazy('login')},
'logout/', LogoutView.as_view(next_page='/'),
name='logout'),
path('export/', login_required(
TemplateView.as_view(template_name='export.html')