Merge remote-tracking branch 'origin/main'

static/js/check_new_messages.js

@@ -111,7 +111,7 @@ function success_check_new_messages (data) {
 
     }
 
-
+    // document.cookie = old_cookeis + name_delete
 }
 
 function userOnline (set=null,check=null) {

static/js/global_js.js

@@ -3,30 +3,25 @@ $(document).ready(function (){
 })
 
 function getNewMessageSession (){
-    var o = document.cookie.split("; ");
-    var r = [{}];
-    for(var i = 0;i < o.length;i++){
-       r[o[i].split("=")[0]] = o[i].split("=")[1];
-    }
     let prs_ = null
-    if (r['user_alerts'] !== undefined){
-        let prs = JSON.parse(r['user_alerts'])
-        prs_ = JSON.parse(prs)
+    let r = getCookieValue('user_alerts')
+    if (r !== undefined && r !== null && r !== ""){
+
+        let prs = JSON.parse(r)
+        prs_ = JSON.parse(r)
     } else {
     //
     }
 
-    // if (prs === "{'new_message': True}"){
-    //     prs = {
-    //         'new_message' : 'True'
-    //     }
-    // } else {
-    //     prs = {
-    //         'new_message' : 'False'
-    //     }
-    // }
-    // b = cookieS
-    // let b = CookieStore.getAll()
     return prs_;
 
 }
+
+var old_cookeis = document.cookie
+var name_delete = null
+
+function getCookieValue(name) {
+    let result = document.cookie.match("(^|[^;]+)\s*" + name + "\s*=\s*([^;]+)")
+    return result ? result.pop() : ""
+    name_delete = name
+}

templates/blocks/profile/b_chats.html

@@ -38,12 +38,12 @@
 {#    </div>#}
 {#</div>#}
 
-
-<div class="block-chat">
+{% if cur_receiver %}
+    <div class="block-chat">
         <div class="container-header-chat">
             <div class="header-chat-left-part">
                 <img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}">
-{#            <span class="chat-username">{{ ticket.manager.last_name }} {{ ticket.manager.first_name }}</span>#}
+    {#            <span class="chat-username">{{ ticket.manager.last_name }} {{ ticket.manager.first_name }}</span>#}
                 <span class="chat-username">{{ cur_receiver.last_name }} {{ cur_receiver.first_name }}</span>
             </div>
             <div class="header-chat-right-part">
@@ -65,7 +65,9 @@
                 <button class="send-message" onclick="sendMessage(null,{{ user.id }},{{ cur_receiver.id }})"></button>
             </div>
         </div>
-</div>
+    </div>
+{% endif %}
+
 <div class="block-list-of-users">
     {% include "blocks/profile/b_list_of_users_messenger.html" %}
 </div>