From dc0d7a4c33f417c6c9ea06340abef38d5298d564 Mon Sep 17 00:00:00 2001 From: Max Yakovenko Date: Thu, 26 Jul 2018 00:37:17 +0300 Subject: [PATCH] refactor admin user forms --- accounts_ext/forms.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/accounts_ext/forms.py b/accounts_ext/forms.py index e721157..ede88b2 100644 --- a/accounts_ext/forms.py +++ b/accounts_ext/forms.py @@ -5,6 +5,7 @@ from crispy_forms.layout import Layout, Field, Div, Submit, HTML from django import forms from django.conf import settings from django.contrib.auth import get_user_model, password_validation +from django.forms import ALL_FIELDS from django.urls import reverse, reverse_lazy from django.utils.translation import ugettext_lazy as _ from django_email_blacklist import DisposableEmailChecker @@ -265,30 +266,26 @@ class CompanyForm(forms.Form): class UserChangeForm(UserChangeFormBase): - status = forms.ChoiceField(choices=STATUS_CHOICES) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - super.init_fields(self.fields) class Meta: model = get_user_model() - fields = '__all__' + fields = ('status',) class UserCreationForm(UserCreationFormBase): def clean_email(self): - email = super().clean_email() + email = self.cleaned_data['email'] if DisposableEmailChecker().is_disposable(email): raise forms.ValidationError(_('Введите email с валидными доменом')) return email - class Meta(UserCreationFormBase.Meta): + class Meta: model = get_user_model() - fields = ('email', 'username', 'status',) + fields = ('email', 'username', 'status', 'is_superuser') field_classes = { 'email': forms.EmailField, 'username': UsernameField, - 'status': forms.ChoiceField + 'status': forms.ChoiceField, + 'is_superuser': forms.BooleanField }