0.8.33 tickets text
This commit is contained in:
@@ -38,8 +38,17 @@ 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):
|
def get_last_msg_txt(self):
|
||||||
return self.rel_messages_for_group.all().order_by('-createDT').first()
|
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:
|
class Meta:
|
||||||
verbose_name = _('Тикет')
|
verbose_name = _('Тикет')
|
||||||
|
|||||||
@@ -19,11 +19,7 @@
|
|||||||
<div class="message-sprt-title">
|
<div class="message-sprt-title">
|
||||||
<span>
|
<span>
|
||||||
{# Текст последнего сообщени в чате (с размытием)#}
|
{# Текст последнего сообщени в чате (с размытием)#}
|
||||||
{% if ticket.get_last_msg.text %}
|
{{ ticket.get_last_msg_txt }}
|
||||||
{{ 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