diff --git a/ChatServiceApp/models.py b/ChatServiceApp/models.py index 827d729..eaa69de 100644 --- a/ChatServiceApp/models.py +++ b/ChatServiceApp/models.py @@ -46,7 +46,7 @@ class MsgGroup(BaseModel): if msg.text: return msg.text elif msg.files: - return msg.files[0].file_name + return msg.files[0]['file_name'] return self.name diff --git a/static/js/chat_socket_functions/update_tickets_operations_manager.js b/static/js/chat_socket_functions/update_tickets_operations_manager.js index d067f69..93e18e2 100644 --- a/static/js/chat_socket_functions/update_tickets_operations_manager.js +++ b/static/js/chat_socket_functions/update_tickets_operations_manager.js @@ -69,7 +69,7 @@ function clear_messenger (data) { let dataset_cont_mes = container_messenger.dataset if (dataset_cont_mes){ let ticket_id = dataset_cont_mes["ticketId"] - if (ticket_id !== ""){s + if (ticket_id !== ""){ let ticket = document.querySelector(`[data-cur-receiver-item="${ticket_id}"]`) if (ticket === null){ document.querySelector(".block-chat").style.display = "none" diff --git a/static/js/chat_sockets.js b/static/js/chat_sockets.js index 8d78f19..87963cc 100644 --- a/static/js/chat_sockets.js +++ b/static/js/chat_sockets.js @@ -59,6 +59,8 @@ function wsReceiveData (e) { if (user_id) { if (ticket_maneger.toString() !== user_id) { clear_messenger() + } else { + } } else { diff --git a/templates/tb_base.html b/templates/tb_base.html index dbceb29..bfba730 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -28,7 +28,7 @@