From f4d4cffa9ffd39f81c50cffb6214487813e9d970 Mon Sep 17 00:00:00 2001 From: Artyom Kravchenko Date: Mon, 19 Apr 2021 17:52:10 +0300 Subject: [PATCH] tmp commit --- access_controller/settings.py | 18 +++--- db/zd_db.sqlite3 | Bin 159744 -> 0 bytes main/migrations/0001_initial.py | 34 ++--------- main/migrations/0002_userprofile_name.py | 18 ++++++ main/migrations/0003_auto_20210216_2222.py | 23 ++++++++ main/migrations/0004_rolechangelogs.py | 27 +++++++++ main/migrations/0005_auto_20210302_2255.py | 17 ++++++ main/migrations/0006_delete_userprofile.py | 16 +++++ main/migrations/0007_userprofile.py | 29 ++++++++++ main/migrations/0008_auto_20210303_2305.py | 17 ++++++ main/migrations/0009_models_help_text.py | 61 ++++++++++++++++++++ main/migrations/0010_userprofile_meta.py | 17 ++++++ main/migrations/0011_auto_20210311_1734.py | 28 +++++++++ main/migrations/0012_auto_20210311_2027.py | 29 ++++++++++ main/migrations/0013_auto_20210311_2040.py | 18 ++++++ main/migrations/0014_auto_20210314_1455.py | 29 ++++++++++ main/migrations/0015_auto_20210321_1600.py | 18 ++++++ main/migrations/0015_auto_20210330_0007.py | 18 ++++++ main/migrations/0016_merge_20210330_0043.py | 14 +++++ 19 files changed, 392 insertions(+), 39 deletions(-) delete mode 100644 db/zd_db.sqlite3 create mode 100644 main/migrations/0002_userprofile_name.py create mode 100644 main/migrations/0003_auto_20210216_2222.py create mode 100644 main/migrations/0004_rolechangelogs.py create mode 100644 main/migrations/0005_auto_20210302_2255.py create mode 100644 main/migrations/0006_delete_userprofile.py create mode 100644 main/migrations/0007_userprofile.py create mode 100644 main/migrations/0008_auto_20210303_2305.py create mode 100644 main/migrations/0009_models_help_text.py create mode 100644 main/migrations/0010_userprofile_meta.py create mode 100644 main/migrations/0011_auto_20210311_1734.py create mode 100644 main/migrations/0012_auto_20210311_2027.py create mode 100644 main/migrations/0013_auto_20210311_2040.py create mode 100644 main/migrations/0014_auto_20210314_1455.py create mode 100644 main/migrations/0015_auto_20210321_1600.py create mode 100644 main/migrations/0015_auto_20210330_0007.py create mode 100644 main/migrations/0016_merge_20210330_0043.py diff --git a/access_controller/settings.py b/access_controller/settings.py index 1034aaf..a7585ed 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -19,10 +19,10 @@ BASE_DIR = Path(__file__).resolve().parent.parent # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.getenv('ACTRL_SECRET_KEY') +SECRET_KEY = os.getenv('ACTRL_SECRET_KEY','empty') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = bool(int(os.getenv('ACTRL_DEBUG'))) +DEBUG = bool(int(os.getenv('ACTRL_DEBUG',1))) ALLOWED_HOSTS = [ '127.0.0.1', @@ -57,13 +57,13 @@ MIDDLEWARE = [ ROOT_URLCONF = 'access_controller.urls' EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -EMAIL_HOST = os.getenv('ACTRL_EMAIL_HOST') -EMAIL_PORT = int(os.getenv('ACTRL_EMAIL_PORT')) -EMAIL_USE_TLS = bool(int(os.getenv('ACTRL_EMAIL_TLS'))) -EMAIL_HOST_USER = os.getenv('ACTRL_EMAIL_HOST_USER') -EMAIL_HOST_PASSWORD = os.getenv('ACTRL_EMAIL_HOST_PASSWORD') -DEFAULT_FROM_EMAIL = os.getenv('ACTRL_FROM_EMAIL') -SERVER_EMAIL = os.getenv('ACTRL_SERVER_EMAIL') +EMAIL_HOST = os.getenv('ACTRL_EMAIL_HOST','smtp.gmail.com') +EMAIL_PORT = int(os.getenv('ACTRL_EMAIL_PORT',587)) +EMAIL_USE_TLS = bool(int(os.getenv('ACTRL_EMAIL_TLS',1))) +EMAIL_HOST_USER = os.getenv('ACTRL_EMAIL_HOST_USER','group02django@gmail.com') +EMAIL_HOST_PASSWORD = os.getenv('ACTRL_EMAIL_HOST_PASSWORD','djangogroup02') +DEFAULT_FROM_EMAIL = os.getenv('ACTRL_FROM_EMAIL',EMAIL_HOST_USER) +SERVER_EMAIL = os.getenv('ACTRL_SERVER_EMAIL',EMAIL_HOST_USER) TEMPLATES = [ { diff --git a/db/zd_db.sqlite3 b/db/zd_db.sqlite3 deleted file mode 100644 index 1abaf8ab5d4354178274808344ffa9a452cddc84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159744 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 diff --git a/main/migrations/0001_initial.py b/main/migrations/0001_initial.py index 6909bfc..db1dffd 100644 --- a/main/migrations/0001_initial.py +++ b/main/migrations/0001_initial.py @@ -1,9 +1,8 @@ -# Generated by Django 3.1.6 on 2021-03-31 12:43 +# Generated by Django 3.1.6 on 2021-02-04 17:39 from django.conf import settings from django.db import migrations, models import django.db.models.deletion -import django.utils.timezone class Migration(migrations.Migration): @@ -19,34 +18,9 @@ class Migration(migrations.Migration): name='UserProfile', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('role', models.CharField(default='None', help_text='Глобальное имя роли пользователя', max_length=100)), - ('custom_role_id', models.IntegerField(default=0, help_text='Код роли пользователя')), - ('image', models.URLField(blank=True, help_text='Аватарка', null=True)), - ('name', models.CharField(default='None', help_text='Имя пользователя на нашем сайте', max_length=100)), - ('user', models.OneToOneField(help_text='Пользователь', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'permissions': (('has_control_access', 'Can view admin page'),), - }, - ), - migrations.CreateModel( - name='UnassignedTicket', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ticket_id', models.IntegerField(help_text='Номер тикера, для которого сняли ответственного')), - ('status', models.IntegerField(choices=[(0, 'Снят с пользователя, перенесён в буферную группу'), (1, 'Авторство восстановлено'), (2, 'Пока нас не было, тикет испарился из буферной группы. Дополнительные действия не требуются'), (3, 'Тикет уже был закрыт. Дополнительные действия не требуются'), (4, 'Тикет решён. Записан на пользователя с почтой SOLVED_TICKETS_EMAIL')], default=0, help_text='Статус тикета')), - ('assignee', models.ForeignKey(help_text='Пользователь, с которого снят тикет', on_delete=django.db.models.deletion.CASCADE, related_name='tickets', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='RoleChangeLogs', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('old_role', models.IntegerField(default=0, help_text='Старая роль')), - ('new_role', models.IntegerField(default=0, help_text='Присвоенная роль')), - ('change_time', models.DateTimeField(default=django.utils.timezone.now, help_text='Дата и время изменения роли')), - ('changed_by', models.ForeignKey(help_text='Кем была изменена роль', on_delete=django.db.models.deletion.CASCADE, related_name='changed_by', to=settings.AUTH_USER_MODEL)), - ('user', models.ForeignKey(help_text='Пользователь, которому присвоили другую роль', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('role', models.IntegerField()), + ('image', models.ImageField(upload_to='user_avatars')), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), ] diff --git a/main/migrations/0002_userprofile_name.py b/main/migrations/0002_userprofile_name.py new file mode 100644 index 0000000..1737da2 --- /dev/null +++ b/main/migrations/0002_userprofile_name.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.6 on 2021-02-08 16:15 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='userprofile', + name='name', + field=models.CharField(default='None', max_length=100), + ), + ] diff --git a/main/migrations/0003_auto_20210216_2222.py b/main/migrations/0003_auto_20210216_2222.py new file mode 100644 index 0000000..33076ac --- /dev/null +++ b/main/migrations/0003_auto_20210216_2222.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.6 on 2021-02-16 19:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0002_userprofile_name'), + ] + + operations = [ + migrations.AlterField( + model_name='userprofile', + name='image', + field=models.URLField(blank=True, null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='role', + field=models.CharField(default='None', max_length=100), + ), + ] diff --git a/main/migrations/0004_rolechangelogs.py b/main/migrations/0004_rolechangelogs.py new file mode 100644 index 0000000..c3d6328 --- /dev/null +++ b/main/migrations/0004_rolechangelogs.py @@ -0,0 +1,27 @@ +# Generated by Django 3.1.6 on 2021-02-17 17:25 + +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', '0003_auto_20210216_2222'), + ] + + operations = [ + migrations.CreateModel( + name='RoleChangeLogs', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.TextField()), + ('new_role', models.TextField()), + ('change_time', models.DateTimeField()), + ('changed_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='changed_by', to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/main/migrations/0005_auto_20210302_2255.py b/main/migrations/0005_auto_20210302_2255.py new file mode 100644 index 0000000..dff2dc2 --- /dev/null +++ b/main/migrations/0005_auto_20210302_2255.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.6 on 2021-03-02 19:55 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0004_rolechangelogs'), + ] + + operations = [ + migrations.AlterModelOptions( + name='userprofile', + options={'permissions': [('admin', 'Have access to control page')]}, + ), + ] diff --git a/main/migrations/0006_delete_userprofile.py b/main/migrations/0006_delete_userprofile.py new file mode 100644 index 0000000..23adaab --- /dev/null +++ b/main/migrations/0006_delete_userprofile.py @@ -0,0 +1,16 @@ +# Generated by Django 3.1.6 on 2021-03-03 19:32 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0005_auto_20210302_2255'), + ] + + operations = [ + migrations.DeleteModel( + name='UserProfile', + ), + ] diff --git a/main/migrations/0007_userprofile.py b/main/migrations/0007_userprofile.py new file mode 100644 index 0000000..2b05dd7 --- /dev/null +++ b/main/migrations/0007_userprofile.py @@ -0,0 +1,29 @@ +# Generated by Django 3.1.6 on 2021-03-03 19:35 + +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', '0006_delete_userprofile'), + ] + + operations = [ + migrations.CreateModel( + name='UserProfile', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('role', models.CharField(default='None', max_length=100)), + ('image', models.URLField(blank=True, null=True)), + ('name', models.CharField(default='None', max_length=100)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'permissions': [('control_access', 'User has access to control page')], + }, + ), + ] diff --git a/main/migrations/0008_auto_20210303_2305.py b/main/migrations/0008_auto_20210303_2305.py new file mode 100644 index 0000000..8082682 --- /dev/null +++ b/main/migrations/0008_auto_20210303_2305.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.6 on 2021-03-03 20:05 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0007_userprofile'), + ] + + operations = [ + migrations.AlterModelOptions( + name='userprofile', + options={}, + ), + ] diff --git a/main/migrations/0009_models_help_text.py b/main/migrations/0009_models_help_text.py new file mode 100644 index 0000000..4bc87e1 --- /dev/null +++ b/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), + ), + ] diff --git a/main/migrations/0010_userprofile_meta.py b/main/migrations/0010_userprofile_meta.py new file mode 100644 index 0000000..28fa435 --- /dev/null +++ b/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'),)}, + ), + ] diff --git a/main/migrations/0011_auto_20210311_1734.py b/main/migrations/0011_auto_20210311_1734.py new file mode 100644 index 0000000..c228bfc --- /dev/null +++ b/main/migrations/0011_auto_20210311_1734.py @@ -0,0 +1,28 @@ +# Generated by Django 3.1.6 on 2021-03-11 14:34 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0010_userprofile_meta'), + ] + + operations = [ + migrations.AddField( + model_name='rolechangelogs', + name='old_role', + field=models.IntegerField(default=0, 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.IntegerField(default=0, help_text='Код роли пользователя'), + ), + ] diff --git a/main/migrations/0012_auto_20210311_2027.py b/main/migrations/0012_auto_20210311_2027.py new file mode 100644 index 0000000..113e51e --- /dev/null +++ b/main/migrations/0012_auto_20210311_2027.py @@ -0,0 +1,29 @@ +# Generated by Django 3.1.6 on 2021-03-11 17:27 + +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', '0011_auto_20210311_1734'), + ] + + operations = [ + migrations.RemoveField( + model_name='rolechangelogs', + name='name', + ), + migrations.CreateModel( + name='UnassignedTicket', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ticket_id', models.IntegerField(help_text='Номер тикера, для которого сняли ответственного')), + ('status', models.IntegerField(choices=[(0, 'Снят с пользователя, перенесён в буферную группу'), (1, 'Авторство восстановлено'), (2, 'Пока нас не было, тикет испарился из буферной группы. Дополнительные действия не требуются')], default=0)), + ('assignee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tickets', to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/main/migrations/0013_auto_20210311_2040.py b/main/migrations/0013_auto_20210311_2040.py new file mode 100644 index 0000000..5648813 --- /dev/null +++ b/main/migrations/0013_auto_20210311_2040.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.6 on 2021-03-11 17:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0012_auto_20210311_2027'), + ] + + operations = [ + migrations.AlterField( + model_name='unassignedticket', + name='status', + field=models.IntegerField(choices=[(0, 'Снят с пользователя, перенесён в буферную группу'), (1, 'Авторство восстановлено'), (2, 'Пока нас не было, тикет испарился из буферной группы. Дополнительные действия не требуются'), (3, 'Тикет уже был закрыт. Дополнительные действия не требуются')], default=0), + ), + ] diff --git a/main/migrations/0014_auto_20210314_1455.py b/main/migrations/0014_auto_20210314_1455.py new file mode 100644 index 0000000..77db2ec --- /dev/null +++ b/main/migrations/0014_auto_20210314_1455.py @@ -0,0 +1,29 @@ +# Generated by Django 3.1.6 on 2021-03-14 11:55 + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0013_auto_20210311_2040'), + ] + + operations = [ + migrations.AddField( + model_name='userprofile', + name='custom_role_id', + field=models.IntegerField(default=0, help_text='Код роли пользователя'), + ), + migrations.AlterField( + model_name='rolechangelogs', + name='change_time', + field=models.DateTimeField(default=django.utils.timezone.now, help_text='Дата и время изменения роли'), + ), + migrations.AlterField( + model_name='userprofile', + name='role', + field=models.CharField(default='None', help_text='Глобальное имя роли пользователя', max_length=100), + ), + ] diff --git a/main/migrations/0015_auto_20210321_1600.py b/main/migrations/0015_auto_20210321_1600.py new file mode 100644 index 0000000..79b5726 --- /dev/null +++ b/main/migrations/0015_auto_20210321_1600.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.6 on 2021-03-21 13:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0014_auto_20210314_1455'), + ] + + operations = [ + migrations.AlterField( + model_name='unassignedticket', + name='status', + field=models.IntegerField(choices=[(0, 'Снят с пользователя, перенесён в буферную группу'), (1, 'Авторство восстановлено'), (2, 'Пока нас не было, тикет испарился из буферной группы. Дополнительные действия не требуются'), (3, 'Тикет уже был закрыт. Дополнительные действия не требуются'), (4, 'Тикет решён. Записан на пользователя с почтой SOLVED_TICKETS_EMAIL')], default=0), + ), + ] diff --git a/main/migrations/0015_auto_20210330_0007.py b/main/migrations/0015_auto_20210330_0007.py new file mode 100644 index 0000000..91398ba --- /dev/null +++ b/main/migrations/0015_auto_20210330_0007.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.6 on 2021-03-29 21:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0014_auto_20210314_1455'), + ] + + operations = [ + migrations.AlterField( + model_name='unassignedticket', + name='status', + field=models.IntegerField(choices=[(0, 'Снят с пользователя, перенесён в буферную группу'), (1, 'Авторство восстановлено'), (2, 'Пока нас не было, тикет испарился из буферной группы. Дополнительные действия не требуются'), (3, 'Тикет уже был закрыт. Дополнительные действия не требуются'), (4, 'Тикет решён. Записан на пользователя с почтой SOLVED_TICKETS_EMAIL')], default=0), + ), + ] diff --git a/main/migrations/0016_merge_20210330_0043.py b/main/migrations/0016_merge_20210330_0043.py new file mode 100644 index 0000000..efb1d45 --- /dev/null +++ b/main/migrations/0016_merge_20210330_0043.py @@ -0,0 +1,14 @@ +# Generated by Django 3.1.6 on 2021-03-29 21:43 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0015_auto_20210330_0007'), + ('main', '0015_auto_20210321_1600'), + ] + + operations = [ + ]