From ff8834f22d20629f0902c968a5730ae2f7cd7f6f Mon Sep 17 00:00:00 2001 From: Artyom Kravchenko Date: Wed, 31 Mar 2021 15:02:37 +0300 Subject: [PATCH] fixed migrations bug --- access_controller/settings.py | 10 +++--- db/zd_db.sqlite3 | Bin 159744 -> 0 bytes main/migrations/0001_initial.py | 52 -------------------------------- 3 files changed, 6 insertions(+), 56 deletions(-) delete mode 100644 db/zd_db.sqlite3 delete mode 100644 main/migrations/0001_initial.py diff --git a/access_controller/settings.py b/access_controller/settings.py index 4b011a7..a1caf3b 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -179,9 +179,11 @@ LOGGING = { } } + + ZENDESK_ROLES = { - 'engineer': int(os.getenv('ENG_CROLE_ID')), - 'light_agent': int(os.getenv('LA_CROLE_ID')), + 'engineer': int(os.getenv('ENG_CROLE_ID',0)), + 'light_agent': int(os.getenv('LA_CROLE_ID',0)), } ZENDESK_GROUPS = { @@ -191,7 +193,7 @@ ZENDESK_GROUPS = { SOLVED_TICKETS_EMAIL = os.getenv('ST_EMAIL') -ZENDESK_MAX_AGENTS = int(os.getenv('LICENSE_NO')) +ZENDESK_MAX_AGENTS = int(os.getenv('LICENSE_NO',0)) REST_FRAMEWORK = { # Use Django's standard `django.contrib.auth` permissions, @@ -201,4 +203,4 @@ REST_FRAMEWORK = { ] } -ONE_DAY = int(os.getenv('SHIFTH')) # Количество часов в 1 рабочем дне +ONE_DAY = int(os.getenv('SHIFTH',0)) # Количество часов в 1 рабочем дне diff --git a/db/zd_db.sqlite3 b/db/zd_db.sqlite3 deleted file mode 100644 index b9588f62702d15a463500e4dd92ee8707789d6ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159744 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 Z1V8`;KmY_l00j0ffuq)hv-|r0{{dLvutxv@ diff --git a/main/migrations/0001_initial.py b/main/migrations/0001_initial.py deleted file mode 100644 index 4773f00..0000000 --- a/main/migrations/0001_initial.py +++ /dev/null @@ -1,52 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-30 22:06 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - 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', 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)), - ], - ), - ]