tmp commit
This commit is contained in:
parent
b4c0ab0d67
commit
f4d4cffa9f
@ -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 = [
|
||||
{
|
||||
|
BIN
db/zd_db.sqlite3
BIN
db/zd_db.sqlite3
Binary file not shown.
@ -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)),
|
||||
],
|
||||
),
|
||||
]
|
||||
|
18
main/migrations/0002_userprofile_name.py
Normal file
18
main/migrations/0002_userprofile_name.py
Normal file
@ -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),
|
||||
),
|
||||
]
|
23
main/migrations/0003_auto_20210216_2222.py
Normal file
23
main/migrations/0003_auto_20210216_2222.py
Normal file
@ -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),
|
||||
),
|
||||
]
|
27
main/migrations/0004_rolechangelogs.py
Normal file
27
main/migrations/0004_rolechangelogs.py
Normal file
@ -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)),
|
||||
],
|
||||
),
|
||||
]
|
17
main/migrations/0005_auto_20210302_2255.py
Normal file
17
main/migrations/0005_auto_20210302_2255.py
Normal file
@ -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')]},
|
||||
),
|
||||
]
|
16
main/migrations/0006_delete_userprofile.py
Normal file
16
main/migrations/0006_delete_userprofile.py
Normal file
@ -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',
|
||||
),
|
||||
]
|
29
main/migrations/0007_userprofile.py
Normal file
29
main/migrations/0007_userprofile.py
Normal file
@ -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')],
|
||||
},
|
||||
),
|
||||
]
|
17
main/migrations/0008_auto_20210303_2305.py
Normal file
17
main/migrations/0008_auto_20210303_2305.py
Normal file
@ -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={},
|
||||
),
|
||||
]
|
61
main/migrations/0009_models_help_text.py
Normal file
61
main/migrations/0009_models_help_text.py
Normal file
@ -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),
|
||||
),
|
||||
]
|
17
main/migrations/0010_userprofile_meta.py
Normal file
17
main/migrations/0010_userprofile_meta.py
Normal file
@ -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'),)},
|
||||
),
|
||||
]
|
28
main/migrations/0011_auto_20210311_1734.py
Normal file
28
main/migrations/0011_auto_20210311_1734.py
Normal file
@ -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='Код роли пользователя'),
|
||||
),
|
||||
]
|
29
main/migrations/0012_auto_20210311_2027.py
Normal file
29
main/migrations/0012_auto_20210311_2027.py
Normal file
@ -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)),
|
||||
],
|
||||
),
|
||||
]
|
18
main/migrations/0013_auto_20210311_2040.py
Normal file
18
main/migrations/0013_auto_20210311_2040.py
Normal file
@ -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),
|
||||
),
|
||||
]
|
29
main/migrations/0014_auto_20210314_1455.py
Normal file
29
main/migrations/0014_auto_20210314_1455.py
Normal file
@ -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),
|
||||
),
|
||||
]
|
18
main/migrations/0015_auto_20210321_1600.py
Normal file
18
main/migrations/0015_auto_20210321_1600.py
Normal file
@ -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),
|
||||
),
|
||||
]
|
18
main/migrations/0015_auto_20210330_0007.py
Normal file
18
main/migrations/0015_auto_20210330_0007.py
Normal file
@ -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),
|
||||
),
|
||||
]
|
14
main/migrations/0016_merge_20210330_0043.py
Normal file
14
main/migrations/0016_merge_20210330_0043.py
Normal file
@ -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 = [
|
||||
]
|
Loading…
x
Reference in New Issue
Block a user