From e2bed36c5f3c91008d6e4e63767f7d8507bdae3d Mon Sep 17 00:00:00 2001 From: SDE Date: Mon, 14 Aug 2023 17:32:00 +0300 Subject: [PATCH] 0.3.15 support chat v3 --- ChatServiceApp/funcs.py | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/ChatServiceApp/funcs.py b/ChatServiceApp/funcs.py index 0d8331c..f4ab887 100644 --- a/ChatServiceApp/funcs.py +++ b/ChatServiceApp/funcs.py @@ -98,20 +98,6 @@ def update_chat(data): # получаем правую панель с получателями # получатели receivers, unread_msgs_count = get_chat_receivers_for_user(receiver) - # собираем для сохранения в профиле - # receivers_unread_msgs_count = sorted( - # [{'id': item.id, 'unread_msgs_count': item.unread_msgs_count} for item in receivers], - # key=lambda d: d['id']) - # # забираем данные из профиля - # saved_receivers_unread_msgs_count = sender.user_profile.get_node_by_name( - # 'receivers_unread_msgs_count') - # # если данных нет или данные поменялись - # if saved_receivers_unread_msgs_count == None or receivers_unread_msgs_count != saved_receivers_unread_msgs_count: - # # записываем данные в профиль - # sender.user_profile.add_node_to_json_data( - # {'receivers_unread_msgs_count': receivers_unread_msgs_count}, save=True) - # # разрешаем сигнал - # required_beep = True # формируем правую панель context_Dict.update({'receivers': receivers}) @@ -122,11 +108,16 @@ def update_chat(data): 'unread_msgs_count': unread_msgs_count }) - msgs = get_msgs_for_chat_w_users(sender, receiver) - context_Dict.update({'messages': msgs}) - chat_html = render_to_string(tpl_name, context_Dict) - res_Dict.update({'chat_html': chat_html}) + + if ticket: + msgs = get_messages_for_ticket(ticket) + context_Dict.update({'ticket': ticket}) + + context_Dict.update({'messages': msgs}) + chat_html = render_to_string(tpl_name, context_Dict) + res_Dict.update({'chat_html': chat_html}) + res_Dict.update({ 'required_beep': required_beep,