diff --git a/apps/users/forms.py b/apps/users/forms.py index c4f008663..c27bd4378 100644 --- a/apps/users/forms.py +++ b/apps/users/forms.py @@ -29,7 +29,7 @@ class UserCreateUpdateForm(forms.ModelForm): model = User fields = [ 'username', 'name', 'email', 'groups', 'wechat', - 'phone', 'role', 'date_expired', 'comment', 'password' + 'phone', 'role', 'date_expired', 'comment', ] help_texts = { 'username': '* required', @@ -38,13 +38,16 @@ class UserCreateUpdateForm(forms.ModelForm): } widgets = { 'groups': forms.SelectMultiple( - attrs={'class': 'select2', - 'data-placeholder': _('Join user groups')}), + attrs={ + 'class': 'select2', + 'data-placeholder': _('Join user groups') + } + ), } def save(self, commit=True): + password = self.cleaned_data.pop('password') user = super().save(commit=commit) - password = self.cleaned_data.get('password') if password: user.set_password(password) user.save()