Refactor: separate forms from view, improve code style

src/pretix/control/views/user.py

@@ -1,100 +1,13 @@
-from django import forms
 from django.contrib import messages
 from django.contrib.auth import update_session_auth_hash
-from django.contrib.auth.hashers import check_password
 from django.core.urlresolvers import reverse
-from django.db.models import Q
 from django.views.generic import UpdateView
 from django.utils.translation import ugettext_lazy as _
-from pytz import common_timezones
+from pretix.control.forms.user import UserSettingsForm
 
 from pretix.base.models import User
 
 
-class UserSettingsForm(forms.ModelForm):
-    error_messages = {
-        'duplicate_identifier': _("There already is an account associated with this e-mail address. "
-                                  "Please choose a different one."),
-        'pw_current': _("Please enter your current password if you want to change your e-mail "
-                        "address or password."),
-        'pw_current_wrong': _("The current password you entered was not correct."),
-        'pw_mismatch': _("Please enter the same password twice"),
-    }
-
-    old_pw = forms.CharField(max_length=255,
-                             required=False,
-                             label=_("Your current password"),
-                             widget=forms.PasswordInput())
-    new_pw = forms.CharField(max_length=255,
-                             required=False,
-                             label=_("New password"),
-                             widget=forms.PasswordInput())
-    new_pw_repeat = forms.CharField(max_length=255,
-                                    required=False,
-                                    label=_("Repeat new password"),
-                                    widget=forms.PasswordInput())
-    timezone = forms.ChoiceField(
-        choices=((a, a) for a in common_timezones),
-        label=_("Default timezone"),
-    )
-
-    class Meta:
-        model = User
-        fields = [
-            'givenname', 'familyname', 'locale', 'timezone', 'email'
-        ]
-
-    def __init__(self, *args, **kwargs):
-        self.user = kwargs.pop('user')
-        super().__init__(*args, **kwargs)
-
-    def clean_old_pw(self):
-        old_pw = self.cleaned_data.get('old_pw')
-        if old_pw and not check_password(old_pw, self.user.password):
-            raise forms.ValidationError(
-                self.error_messages['pw_current_wrong'],
-                code='pw_current_wrong',
-            )
-        return old_pw
-
-    def clean_email(self):
-        email = self.cleaned_data['email']
-        if User.objects.filter(
-            Q(identifier=email)
-            & ~Q(pk=self.instance.pk)
-        ).exists():
-            raise forms.ValidationError(
-                self.error_messages['duplicate_identifier'],
-                code='duplicate_identifier',
-            )
-        return email
-
-    def clean(self):
-        password1 = self.cleaned_data.get('new_pw')
-        password2 = self.cleaned_data.get('new_pw_repeat')
-        old_pw = self.cleaned_data.get('old_pw')
-        email = self.cleaned_data.get('email')
-
-        if (password1 or email != self.user.email) and not old_pw:
-            raise forms.ValidationError(
-                self.error_messages['pw_current'],
-                code='pw_current',
-            )
-
-        if password1 and password1 != password2:
-            raise forms.ValidationError(
-                self.error_messages['pw_mismatch'],
-                code='pw_mismatch',
-            )
-
-        if password1:
-            self.instance.set_password(password1)
-
-        self.instance.identifier = email
-
-        return self.cleaned_data
-
-
 class UserSettings(UpdateView):
     model = User
     form_class = UserSettingsForm