diff --git a/TODO.txt b/TODO.txt index 2a2f6c0..950da2f 100644 --- a/TODO.txt +++ b/TODO.txt @@ -2,7 +2,6 @@ - Copy Event - Tourenreferent managed Gruppen der Subreferenten - Placeholder von forms in config/app_config -- Passwort vergessen Funktion - Besserer Zurück-Button in Formulare - uhrzeitfelder ohne widget diff --git a/dav_events/emails.py b/dav_events/emails.py index be51ef9..5b74fa0 100644 --- a/dav_events/emails.py +++ b/dav_events/emails.py @@ -64,8 +64,6 @@ class AbstractMail(object): raise NotImplementedError() def send(self): - if not app_config.settings.enable_email_notifications: - return None subject = self._get_subject() body = self._get_body() sender = self._sender @@ -94,6 +92,11 @@ class AbstractEventMail(AbstractMail): context.update(self._event.get_template_context()) return context + def send(self): + if not app_config.settings.enable_email_notifications: + return None + return super(AbstractMail, self).send() + class NewEventMail(AbstractEventMail): _template_name = 'dav_events/emails/new_event.txt' diff --git a/dav_events/forms/auth.py b/dav_events/forms/auth.py index 7349756..826d43c 100644 --- a/dav_events/forms/auth.py +++ b/dav_events/forms/auth.py @@ -62,3 +62,15 @@ class SetPasswordForm(forms.Form): if commit: self.user.save() 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() diff --git a/dav_events/templates/dav_events/auth/login_form.html b/dav_events/templates/dav_events/auth/login_form.html index c311bd2..248a462 100644 --- a/dav_events/templates/dav_events/auth/login_form.html +++ b/dav_events/templates/dav_events/auth/login_form.html @@ -15,6 +15,7 @@