refactor admin user forms

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
         }