Added 'Forgot Password' function.
This commit is contained in:
1
TODO.txt
1
TODO.txt
@@ -2,7 +2,6 @@
|
|||||||
- Copy Event
|
- Copy Event
|
||||||
- Tourenreferent managed Gruppen der Subreferenten
|
- Tourenreferent managed Gruppen der Subreferenten
|
||||||
- Placeholder von forms in config/app_config
|
- Placeholder von forms in config/app_config
|
||||||
- Passwort vergessen Funktion
|
|
||||||
|
|
||||||
- Besserer Zurück-Button in Formulare
|
- Besserer Zurück-Button in Formulare
|
||||||
- uhrzeitfelder ohne widget
|
- uhrzeitfelder ohne widget
|
||||||
|
|||||||
@@ -64,8 +64,6 @@ class AbstractMail(object):
|
|||||||
raise NotImplementedError()
|
raise NotImplementedError()
|
||||||
|
|
||||||
def send(self):
|
def send(self):
|
||||||
if not app_config.settings.enable_email_notifications:
|
|
||||||
return None
|
|
||||||
subject = self._get_subject()
|
subject = self._get_subject()
|
||||||
body = self._get_body()
|
body = self._get_body()
|
||||||
sender = self._sender
|
sender = self._sender
|
||||||
@@ -94,6 +92,11 @@ class AbstractEventMail(AbstractMail):
|
|||||||
context.update(self._event.get_template_context())
|
context.update(self._event.get_template_context())
|
||||||
return context
|
return context
|
||||||
|
|
||||||
|
def send(self):
|
||||||
|
if not app_config.settings.enable_email_notifications:
|
||||||
|
return None
|
||||||
|
return super(AbstractMail, self).send()
|
||||||
|
|
||||||
|
|
||||||
class NewEventMail(AbstractEventMail):
|
class NewEventMail(AbstractEventMail):
|
||||||
_template_name = 'dav_events/emails/new_event.txt'
|
_template_name = 'dav_events/emails/new_event.txt'
|
||||||
|
|||||||
@@ -62,3 +62,15 @@ class SetPasswordForm(forms.Form):
|
|||||||
if commit:
|
if commit:
|
||||||
self.user.save()
|
self.user.save()
|
||||||
return self.user
|
return self.user
|
||||||
|
|
||||||
|
|
||||||
|
class ResetPasswordForm(forms.Form):
|
||||||
|
username = auth_forms.UsernameField(
|
||||||
|
max_length=254,
|
||||||
|
label=_(u'E-Mail-Adresse'),
|
||||||
|
widget=forms.TextInput(attrs={'autofocus': True}),
|
||||||
|
)
|
||||||
|
|
||||||
|
def clean_username(self):
|
||||||
|
username = self.cleaned_data.get('username')
|
||||||
|
return username.lower()
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
<form action="" method="post">
|
<form action="" method="post">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% bootstrap_form form %}
|
{% bootstrap_form form %}
|
||||||
|
<div class="pull-right"><a href="{% url 'dav_events:reset_password' %}">{% trans 'Passwort vergessen?' %}</a></div>
|
||||||
{% buttons %}
|
{% buttons %}
|
||||||
<button type="submit" class="btn btn-success">
|
<button type="submit" class="btn btn-success">
|
||||||
{% bootstrap_icon 'log-in' %} 
|
{% bootstrap_icon 'log-in' %} 
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
{% extends "dav_events/base.html" %}
|
||||||
|
{% load bootstrap3 %}
|
||||||
|
{% load i18n %}
|
||||||
|
|
||||||
|
{% block head-title %}{% trans 'Passwort vergessen?' %} - {{ user }} - {{ block.super }}{% endblock head-title %}
|
||||||
|
|
||||||
|
{% block page-container %}
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-sm-2">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="col-sm-8">
|
||||||
|
<h3>{% trans 'Passwort vergessen?' %}</h3>
|
||||||
|
<div class="well">
|
||||||
|
<form action="" method="post">
|
||||||
|
{% csrf_token %}
|
||||||
|
{% bootstrap_form form %}
|
||||||
|
{% buttons %}
|
||||||
|
<button type="submit" class="btn btn-success">
|
||||||
|
{% bootstrap_icon 'saved' %} 
|
||||||
|
{% trans 'Neues Passwort per E-Mail zusenden' %}
|
||||||
|
</button>
|
||||||
|
<a class="btn btn-danger" href="{% url 'dav_events:home' %}">
|
||||||
|
{% bootstrap_icon 'remove' %} 
|
||||||
|
{% trans 'Abbrechen' %}
|
||||||
|
</a>
|
||||||
|
{% endbuttons %}
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-sm-3">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock page-container %}
|
||||||
@@ -7,6 +7,7 @@ urlpatterns = [
|
|||||||
url(r'^user/login$', views.auth.LoginView.as_view(), name='login'),
|
url(r'^user/login$', views.auth.LoginView.as_view(), name='login'),
|
||||||
url(r'^user/logout$', views.auth.LogoutView.as_view(), name='logout'),
|
url(r'^user/logout$', views.auth.LogoutView.as_view(), name='logout'),
|
||||||
url(r'^user/password$', views.auth.SetPasswordView.as_view(), name='set_password'),
|
url(r'^user/password$', views.auth.SetPasswordView.as_view(), name='set_password'),
|
||||||
|
url(r'^user/password/reset$', views.auth.ResetPasswordView.as_view(), name='reset_password'),
|
||||||
url(r'^events$', views.events.EventListView.as_view(), name='event_list'),
|
url(r'^events$', views.events.EventListView.as_view(), name='event_list'),
|
||||||
url(r'^events/create$', views.events.EventCreateView.as_view(), name='event_create'),
|
url(r'^events/create$', views.events.EventCreateView.as_view(), name='event_create'),
|
||||||
url(r'^events/export$', views.events.EventListExportView.as_view(), name='event_list_export'),
|
url(r'^events/export$', views.events.EventListExportView.as_view(), name='event_list_export'),
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import logging
|
import logging
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.contrib.auth import views as auth_views
|
from django.contrib.auth import views as auth_views, get_user_model
|
||||||
from django.urls import reverse_lazy
|
from django.urls import reverse_lazy
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import ugettext as _
|
||||||
|
from django.views import generic
|
||||||
|
|
||||||
from .. import emails
|
from .. import emails
|
||||||
from .. import forms
|
from .. import forms
|
||||||
@@ -46,3 +47,26 @@ class SetPasswordView(auth_views.PasswordChangeView):
|
|||||||
email = emails.PasswordSetEmail(self.request.user, form.cleaned_data['new_password'])
|
email = emails.PasswordSetEmail(self.request.user, form.cleaned_data['new_password'])
|
||||||
email.send()
|
email.send()
|
||||||
return r
|
return r
|
||||||
|
|
||||||
|
|
||||||
|
class ResetPasswordView(generic.FormView):
|
||||||
|
form_class = forms.auth.ResetPasswordForm
|
||||||
|
template_name = 'dav_events/auth/reset_password_form.html'
|
||||||
|
success_url = reverse_lazy('dav_events:login')
|
||||||
|
|
||||||
|
def form_valid(self, form):
|
||||||
|
username = form.cleaned_data.get('username')
|
||||||
|
user_model = get_user_model()
|
||||||
|
try:
|
||||||
|
user = user_model.objects.get(username=username)
|
||||||
|
random_password = user_model.objects.make_random_password(length=12)
|
||||||
|
user.set_password(random_password)
|
||||||
|
user.save()
|
||||||
|
email = emails.PasswordSetEmail(user, random_password)
|
||||||
|
email.send()
|
||||||
|
messages.success(self.request, _(u'Neues Passwort versendet.'))
|
||||||
|
logger.info('Password reset for user \'%s\'', username)
|
||||||
|
except user_model.DoesNotExist:
|
||||||
|
logger.warning('Password reset for unknown user \'%s\'', username)
|
||||||
|
|
||||||
|
return super(ResetPasswordView, self).form_valid(form)
|
||||||
|
|||||||
Reference in New Issue
Block a user