From fc37bea98a63f3d64d0aa8ea85553a88f27dab48 Mon Sep 17 00:00:00 2001 From: SDE Date: Sun, 3 Dec 2023 20:49:07 +0300 Subject: [PATCH] 0.8.33 tickets text --- ChatServiceApp/models.py | 13 +++++++++++-- templates/widgets/w_request_tech_support.html | 6 +----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChatServiceApp/models.py b/ChatServiceApp/models.py index b9ab20a..827d729 100644 --- a/ChatServiceApp/models.py +++ b/ChatServiceApp/models.py @@ -38,8 +38,17 @@ class MsgGroup(BaseModel): manager = models.ForeignKey(User, verbose_name=_('Менеджер'), related_name='rel_msgGroups_for_manager', on_delete=models.SET_NULL, null=True) - def get_last_msg(self): - return self.rel_messages_for_group.all().order_by('-createDT').first() + def get_last_msg_txt(self): + msg = self.rel_messages_for_group.all().order_by('-createDT').first() + if not msg: + return self.text + + if msg.text: + return msg.text + elif msg.files: + return msg.files[0].file_name + + return self.name class Meta: verbose_name = _('Тикет') diff --git a/templates/widgets/w_request_tech_support.html b/templates/widgets/w_request_tech_support.html index a1445d0..5d94897 100644 --- a/templates/widgets/w_request_tech_support.html +++ b/templates/widgets/w_request_tech_support.html @@ -19,11 +19,7 @@
{# Текст последнего сообщени в чате (с размытием)#} - {% if ticket.get_last_msg.text %} - {{ ticket.get_last_msg.text }} - {% elif ticket.get_last_msg.files %} - {{ ticket.get_last_msg.files.0.file_name }} - {% endif %} + {{ ticket.get_last_msg_txt }}