Merge branch 'develop' into feature/statistic/backend

main/migrations/0009_models_help_text.py

@@ -0,0 +1,61 @@
+# Generated by Django 3.1.6 on 2021-03-11 08:00
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('main', '0008_auto_20210303_2305'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rolechangelogs',
+            name='change_time',
+            field=models.DateTimeField(help_text='Дата и время изменения роли'),
+        ),
+        migrations.AlterField(
+            model_name='rolechangelogs',
+            name='changed_by',
+            field=models.ForeignKey(help_text='Кем была изменена роль', on_delete=django.db.models.deletion.CASCADE, related_name='changed_by', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='rolechangelogs',
+            name='name',
+            field=models.TextField(help_text='Имя пользователя'),
+        ),
+        migrations.AlterField(
+            model_name='rolechangelogs',
+            name='new_role',
+            field=models.TextField(help_text='Присвоенная роль'),
+        ),
+        migrations.AlterField(
+            model_name='rolechangelogs',
+            name='user',
+            field=models.ForeignKey(help_text='Пользователь, которому присвоили другую роль', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='image',
+            field=models.URLField(blank=True, help_text='Аватарка', null=True),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='name',
+            field=models.CharField(default='None', help_text='Имя пользователя на нашем сайте', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='role',
+            field=models.CharField(default='None', help_text='Код роли пользователя', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='user',
+            field=models.OneToOneField(help_text='Пользователь', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

main/migrations/0010_userprofile_meta.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.1.6 on 2021-03-11 08:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0009_models_help_text'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='userprofile',
+            options={'permissions': (('has_control_access', 'Can view admin page'),)},
+        ),
+    ]

main/models.py

@@ -7,6 +7,11 @@ from django.dispatch import receiver
 class UserProfile(models.Model):
     """Модель профиля пользователя"""
 
+    class Meta:
+        permissions = (
+            ('has_control_access', 'Can view admin page'),
+        )
+
     user = models.OneToOneField(to=User, on_delete=models.CASCADE, help_text='Пользователь')
     role = models.IntegerField(default=0, help_text='Код роли пользователя')
     image = models.URLField(null=True, blank=True, help_text='Аватарка')

main/views.py

@@ -25,13 +25,6 @@ from main.extra_func import check_user_exist, update_profile, get_user_organizat
 from main.forms import AdminPageUsers, CustomRegistrationForm, CustomAuthenticationForm, StatisticForm
 from .models import UserProfile
 
-content_type_temp = ContentType.objects.get_for_model(UserProfile)
-permission_temp, created = Permission.objects.get_or_create(
-    codename='has_control_access',
-    content_type=content_type_temp,
-)
-
-
 class CustomRegistrationView(RegistrationView):
     """
     Отображение и логика работы страницы регистрации пользователя