mirror of
https://git.linux-kernel.at/oliver/ivatar.git
synced 2025-11-17 13:38:03 +00:00
Print login errors, redirect to / on logout and use the Login/Logout view classes, instead of the deprecated functions
This commit is contained in:
@@ -7,6 +7,15 @@
|
|||||||
|
|
||||||
<h1>{% trans 'Login' %}</h1>
|
<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 %}
|
<form action="{% url 'login' %}" method="post" name="login">{% csrf_token %}
|
||||||
|
|
||||||
<table summary="">
|
<table summary="">
|
||||||
|
|||||||
@@ -2,6 +2,9 @@ from django.urls import path
|
|||||||
from django.conf.urls import url
|
from django.conf.urls import url
|
||||||
|
|
||||||
from django.views.generic import TemplateView
|
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 CreateView, PasswordSetView, AddEmailView
|
||||||
from . views import RemoveUnconfirmedEmailView, ConfirmEmailView
|
from . views import RemoveUnconfirmedEmailView, ConfirmEmailView
|
||||||
from . views import RemoveConfirmedEmailView, AssignPhotoEmailView
|
from . views import RemoveConfirmedEmailView, AssignPhotoEmailView
|
||||||
@@ -10,19 +13,16 @@ from . views import ImportPhotoView, RawImageView, DeletePhotoView
|
|||||||
from . views import UploadPhotoView, AssignPhotoOpenIDView
|
from . views import UploadPhotoView, AssignPhotoOpenIDView
|
||||||
from . views import AddOpenIDView, RedirectOpenIDView, ConfirmOpenIDView
|
from . views import AddOpenIDView, RedirectOpenIDView, ConfirmOpenIDView
|
||||||
from . views import CropPhotoView
|
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
|
# Define URL patterns, self documenting
|
||||||
# To see the fancy, colorful evaluation of these use:
|
# To see the fancy, colorful evaluation of these use:
|
||||||
# ./manager show_urls
|
# ./manager show_urls
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('new/', CreateView.as_view(), name='new_account'),
|
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(
|
path(
|
||||||
'logout/', logout, {'next_page': reverse_lazy('login')},
|
'logout/', LogoutView.as_view(next_page='/'),
|
||||||
name='logout'),
|
name='logout'),
|
||||||
path('export/', login_required(
|
path('export/', login_required(
|
||||||
TemplateView.as_view(template_name='export.html')
|
TemplateView.as_view(template_name='export.html')
|
||||||
|
|||||||
Reference in New Issue
Block a user