From 64fd9c7b17c07e841495cb28d8c7c5e0efbabc5b Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 15 Aug 2023 17:38:23 +0300 Subject: [PATCH 1/2] 0.3.24 support chat v3 --- ChatServiceApp/websocket_views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChatServiceApp/websocket_views.py b/ChatServiceApp/websocket_views.py index ad4bd41..7e7eb2e 100644 --- a/ChatServiceApp/websocket_views.py +++ b/ChatServiceApp/websocket_views.py @@ -30,7 +30,7 @@ def get_tickets_w_manager_html(ticket, user, data): Dict = { 'ticket': ticket, - 'tickets_w_manager': get_tickets_for_manager(user) + 'tickets_for_manager': get_tickets_for_manager(user) } tickets_w_manager_html = render_to_string('widgets/w_tickets_w_manager.html', Dict) From e8e9d6af414dcd360b96e0e04f5e25ae41826a1e Mon Sep 17 00:00:00 2001 From: borissedw Date: Tue, 15 Aug 2023 17:50:11 +0300 Subject: [PATCH 2/2] 0.0.146 --- static/js/chat_sockets.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/static/js/chat_sockets.js b/static/js/chat_sockets.js index b89d013..2c83d94 100644 --- a/static/js/chat_sockets.js +++ b/static/js/chat_sockets.js @@ -93,9 +93,15 @@ chatSocket.onmessage = function (e) { if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) { document.querySelector(".list_unlinked_tickets").innerHTML = data.tickets_wo_manager_html if (el_tab !== null) { - document.querySelector(".tab_user_messanger.select").classList.remove("select") - document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`).classList.add("select") - document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`).scrollIntoView({behavior: "smooth"}); + let select_tab = document.querySelector(".tab_user_messanger.select") + if (select_tab) { + select_tab.classList.remove("select") + } + let old_insert_tab = document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`) + if (old_insert_tab) { + old_insert_tab.classList.add("select") + old_insert_tab.scrollIntoView({behavior: "smooth"}); + } } } @@ -105,8 +111,11 @@ chatSocket.onmessage = function (e) { document.querySelector(".list_linked_tickets").innerHTML = data.tickets_w_manager_html if (el_tab !== null){ document.querySelector(".tab_user_messanger.select").classList.remove("select") - document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]` ).classList.add("select") - document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]` ).scrollIntoView({behavior: "smooth"}); + let old_insert_tab = document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`) + if (old_insert_tab) { + old_insert_tab.classList.add("select") + old_insert_tab.scrollIntoView({behavior: "smooth"}); + } } }