From 65253f6904ce90d00cab95cbfda76981e7b00f94 Mon Sep 17 00:00:00 2001
From: Timofey Mazurov <whither1@yandex.ru>
Date: Sat, 10 Apr 2021 21:28:29 +0300
Subject: [PATCH] Fixed custom_role_id change for work page

---
 main/migrations/0009_auto_20210309_2317.py  | 61 ---------------------
 main/migrations/0013_merge_20210315_1948.py | 14 -----
 main/migrations/0014_auto_20210315_1948.py  | 29 ----------
 main/views.py                               |  1 +
 4 files changed, 1 insertion(+), 104 deletions(-)
 delete mode 100644 main/migrations/0009_auto_20210309_2317.py
 delete mode 100644 main/migrations/0013_merge_20210315_1948.py
 delete mode 100644 main/migrations/0014_auto_20210315_1948.py

diff --git a/main/migrations/0009_auto_20210309_2317.py b/main/migrations/0009_auto_20210309_2317.py
deleted file mode 100644
index a59717a..0000000
--- a/main/migrations/0009_auto_20210309_2317.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# Generated by Django 3.1.6 on 2021-03-09 20:17
-
-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),
-        ),
-    ]
diff --git a/main/migrations/0013_merge_20210315_1948.py b/main/migrations/0013_merge_20210315_1948.py
deleted file mode 100644
index c3fa7f0..0000000
--- a/main/migrations/0013_merge_20210315_1948.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by Django 3.1.6 on 2021-03-15 16:48
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('main', '0012_auto_20210312_1225'),
-        ('main', '0009_auto_20210309_2317'),
-    ]
-
-    operations = [
-    ]
diff --git a/main/migrations/0014_auto_20210315_1948.py b/main/migrations/0014_auto_20210315_1948.py
deleted file mode 100644
index 20610af..0000000
--- a/main/migrations/0014_auto_20210315_1948.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 3.1.6 on 2021-03-15 16:48
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('main', '0013_merge_20210315_1948'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='rolechangelogs',
-            name='change_time',
-            field=models.DateTimeField(default=django.utils.timezone.now, help_text='Дата и время изменения роли'),
-        ),
-        migrations.AlterField(
-            model_name='rolechangelogs',
-            name='new_role',
-            field=models.IntegerField(default=0, help_text='Присвоенная роль'),
-        ),
-        migrations.AlterField(
-            model_name='userprofile',
-            name='role',
-            field=models.CharField(default='None', help_text='Глобальное имя роли пользователя', max_length=100),
-        ),
-    ]
diff --git a/main/views.py b/main/views.py
index 0446ea7..e41e254 100644
--- a/main/views.py
+++ b/main/views.py
@@ -194,6 +194,7 @@ def user_update(zenpy_user: User, admin: User, request: WSGIRequest) -> UserProf
 
     admin.users.update(zenpy_user)
     request.user.userprofile.role = "agent"
+    request.user.userprofile.custom_role_id = zenpy_user.custom_role_id
     request.user.userprofile.save()
     messages.success(request, "Права были изменены")