From 06cf088ad776ce6a04236694e90e388598ea3801 Mon Sep 17 00:00:00 2001
From: Mike0001-droid <Majorov-2004@list.ru>
Date: Tue, 4 Jun 2024 14:50:36 +0500
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/proj/account/forms.py       |  2 +-
 server/proj/account/models.py      | 10 ----------
 server/proj/account/serializers.py |  3 +--
 server/proj/conf/settings/base.py  |  4 ++--
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/server/proj/account/forms.py b/server/proj/account/forms.py
index c65f721..e3fcf2d 100644
--- a/server/proj/account/forms.py
+++ b/server/proj/account/forms.py
@@ -47,7 +47,7 @@ class UserChangeForm(forms.ModelForm):
 
     class Meta:
         model = MyUser
-        fields = ('email', 'password', 'is_active', 'is_staff', 'is_superuser')
+        fields = ('email', 'password', 'is_superuser')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/server/proj/account/models.py b/server/proj/account/models.py
index 002554f..0cd58d8 100644
--- a/server/proj/account/models.py
+++ b/server/proj/account/models.py
@@ -49,20 +49,10 @@ class MyUser(AbstractBaseUser, PermissionsMixin):
     first_name = models.CharField('Имя', max_length=150, blank=True)
     last_name = models.CharField('Фамилия', max_length=150, blank=True)
     phone = models.CharField('Телефон', max_length=15, blank=True, null=True, unique=True)
-    is_active = models.BooleanField('Активный', help_text='Отметьте, если пользователь должен считаться активным. '
-                                                          'Уберите эту отметку вместо удаления учётной записи.', default=True)
-    is_staff = models.BooleanField('Статус персонала', help_text='Отметьте, если пользователь может входить в '
-                                                                 'административную часть сайта.', default=False)
     date_joined = models.DateTimeField('Дата регистрации', default=timezone.now)
-    organization = models.CharField('Название организаци', max_length=200, null=True)
-    INN_us = models.CharField('ИНН', max_length=12, null=True)
-    urid_adress = models.CharField('Юридический адрес', max_length=200, null=True)
     number = models.CharField('Номер телефона', max_length=20, null=True)
-
     objects = MyUserManager()
-
     USERNAME_FIELD = 'email'
-
     def __str__(self):
         return self.email
 
diff --git a/server/proj/account/serializers.py b/server/proj/account/serializers.py
index 932e20b..0951e4e 100644
--- a/server/proj/account/serializers.py
+++ b/server/proj/account/serializers.py
@@ -14,8 +14,7 @@ class MyUserSerializer(ModelSerializer):
         fields = ('id', 'email', 'password', 
                   'first_name', 'last_name', 
                   'phone', 'date_joined', 
-                  'last_login', 'INN_us', 
-                  'urid_adress', 'organization'
+                  'number',
                   )
         extra_kwargs = {
             'password': {'write_only': True},
diff --git a/server/proj/conf/settings/base.py b/server/proj/conf/settings/base.py
index 887a404..71c86df 100644
--- a/server/proj/conf/settings/base.py
+++ b/server/proj/conf/settings/base.py
@@ -110,7 +110,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 ROTATE_LOG_SIZE = 15 * 1024 * 1024
 ROTATE_LOG_COUNT = 10
 
-""" LOGGING = {
+LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
     'formatters': {
@@ -159,7 +159,7 @@ ROTATE_LOG_COUNT = 10
             'propagate': False,
         },
     },
-} """
+} 
 
 REST_FRAMEWORK = {
     'DEFAULT_PERMISSION_CLASSES': [