Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -38,6 +38,9 @@ class MsgGroup(BaseModel):
|
|||||||
manager = models.ForeignKey(User, verbose_name=_('Менеджер'), related_name='rel_msgGroups_for_manager',
|
manager = models.ForeignKey(User, verbose_name=_('Менеджер'), related_name='rel_msgGroups_for_manager',
|
||||||
on_delete=models.SET_NULL, null=True)
|
on_delete=models.SET_NULL, null=True)
|
||||||
|
|
||||||
|
def get_last_msg(self):
|
||||||
|
return self.rel_messages_for_group.all().order_by('-createDT').first()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _('Тикет')
|
verbose_name = _('Тикет')
|
||||||
verbose_name_plural = _('Тикеты')
|
verbose_name_plural = _('Тикеты')
|
||||||
|
|||||||
@@ -19,7 +19,11 @@
|
|||||||
<div class="message-sprt-title">
|
<div class="message-sprt-title">
|
||||||
<span>
|
<span>
|
||||||
{# Текст последнего сообщени в чате (с размытием)#}
|
{# Текст последнего сообщени в чате (с размытием)#}
|
||||||
{{ ticket.name }}
|
{% 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 %}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user