diff --git a/AuthApp/middleware.py b/AuthApp/middleware.py index 19bcb80..f2333d1 100644 --- a/AuthApp/middleware.py +++ b/AuthApp/middleware.py @@ -34,7 +34,7 @@ class ResponseInterceptionMiddleware: try: if type(response) == JsonResponse: - for_save_to_session = request.user.user_profile.get_node_by_name('for_save_to_session') + for_save_to_session = request.user.user_profile.pop_node_by_name('for_save_to_session') if for_save_to_session: data = json.loads(response.content) data.update(for_save_to_session) diff --git a/ChatServiceApp/js_views.py b/ChatServiceApp/js_views.py index a353d59..49cb3bf 100644 --- a/ChatServiceApp/js_views.py +++ b/ChatServiceApp/js_views.py @@ -92,7 +92,7 @@ def update_chat_ajax(request): else: msgs = get_msgs_for_chat_w_users(sender, receiver) - if (not msgs and not last_message_modifiedDT) or (msgs and last_message_modifiedDT and msgs[0].modifiedDT <= last_message_modifiedDT): + if (request.user != msgs[0].receiver) or (not msgs and not last_message_modifiedDT) or (msgs and last_message_modifiedDT and msgs[0].modifiedDT <= last_message_modifiedDT): Dict.update({ 'required_beep': False })