From 6461c35f1b0aef4519f4b199b16c54d52f092232 Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 1 Aug 2023 17:59:32 +0300 Subject: [PATCH] 0.1.14 create ticket --- ChatServiceApp/forms.py | 2 +- .../0002_msggroup_manager_msggroup_owner.py | 26 +++++++++++++++++++ ChatServiceApp/models.py | 9 ++++++- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 ChatServiceApp/migrations/0002_msggroup_manager_msggroup_owner.py diff --git a/ChatServiceApp/forms.py b/ChatServiceApp/forms.py index 48631d8..116f7c3 100644 --- a/ChatServiceApp/forms.py +++ b/ChatServiceApp/forms.py @@ -11,7 +11,7 @@ class TicketForm(forms.ModelForm): class Meta: model = MsgGroup exclude = [ - 'files' + 'files', 'status', 'owner', 'manager' # 'name', 'name_plural', 'order', 'createDT', 'modifiedDT', 'enable', 'json_data', # 'receive_msg_by_sms', 'owner', 'owner_type' ] \ No newline at end of file diff --git a/ChatServiceApp/migrations/0002_msggroup_manager_msggroup_owner.py b/ChatServiceApp/migrations/0002_msggroup_manager_msggroup_owner.py new file mode 100644 index 0000000..4ef4cb5 --- /dev/null +++ b/ChatServiceApp/migrations/0002_msggroup_manager_msggroup_owner.py @@ -0,0 +1,26 @@ +# Generated by Django 4.2.2 on 2023-08-01 17:57 + +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), + ('ChatServiceApp', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='msggroup', + name='manager', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rel_msgGroups_for_manager', to=settings.AUTH_USER_MODEL, verbose_name='Менеджер'), + ), + migrations.AddField( + model_name='msggroup', + name='owner', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rel_msgGroups_for_owner', to=settings.AUTH_USER_MODEL, verbose_name='Владелец'), + ), + ] diff --git a/ChatServiceApp/models.py b/ChatServiceApp/models.py index b55eb1f..008d5ad 100644 --- a/ChatServiceApp/models.py +++ b/ChatServiceApp/models.py @@ -1,6 +1,6 @@ from django.db import models from BaseModels.base_models import BaseModel - +from django.utils.translation import gettext_lazy as _ msg_type_choices = ( ('support', 'техподдержка'), @@ -26,9 +26,16 @@ grp_msg_department = ( class MsgGroup(BaseModel): + from AuthApp.models import User + department = models.CharField(verbose_name='Отдел', default='support', choices=grp_msg_department) status = models.CharField(verbose_name='Статус', default='open', choices=grp_msg_status) + owner = models.ForeignKey(User, verbose_name=_('Владелец'), related_name='rel_msgGroups_for_owner', + on_delete=models.SET_NULL, null=True) + manager = models.ForeignKey(User, verbose_name=_('Менеджер'), related_name='rel_msgGroups_for_manager', + on_delete=models.SET_NULL, null=True) + class Message(BaseModel): from AuthApp.models import User