From 97a37a0292e898f37626aea4e7fcfa9354b13d27 Mon Sep 17 00:00:00 2001
From: ArturBaybulatov <neuracorrcommon@gmail.com>
Date: Tue, 6 Sep 2016 17:05:33 +0300
Subject: [PATCH] Fixes

---
 templates/partials/base.html            | 20 ++++++++++++--------
 users/templates/contractor_profile.html | 23 +++++++++++++++++++++--
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/templates/partials/base.html b/templates/partials/base.html
index c399266..4c32a99 100644
--- a/templates/partials/base.html
+++ b/templates/partials/base.html
@@ -79,8 +79,6 @@
 <script src='{% static "js/main.js" %}'></script> <!-- Файл верстальщика -->
 <script src='{% static "index.js" %}'></script> <!-- Файл программистов -->
 
-{% block js_block %}{% endblock %}
-
 <script>
     var SocketHandlerMain = function (userId) {
         var domain = '{{ request.META.HTTP_HOST }}';
@@ -110,14 +108,20 @@
 
                 $.jGrowl("Вам пришло новое сообщение!<br />" + outMessage, { life: 15000});
             };
+            
+            this.add_message = function (messageData) {
+                sock.send(JSON.stringify(messageData));
+            };
         }
     };
-    $(function () {
-        var userId = '{{ request.user.pk }}';
-        if (userId) {
-            var socketMain = new SocketHandlerMain(userId);
-        }
-    });
+    
+    var userId = '{{ request.user.pk }}';
+    
+    if (userId) {
+        var socketMain = new SocketHandlerMain(userId);
+    }
 </script>
+
+{% block js_block %}{% endblock %}
 </body>
 </html>
diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html
index 38b201c..bfd5664 100644
--- a/users/templates/contractor_profile.html
+++ b/users/templates/contractor_profile.html
@@ -23,7 +23,7 @@
                     </div>
                     <div class="menuUser disTab">
                         <ul>
-                            {% if contractor.pk == user.pk %}
+                            {% if contractor.pk == request.user.pk %}
                                 <li class="icon_um1">
                                     <a href="{% url 'users:user-profile-edit' pk=contractor.pk %}">
                                         редактировать профиль
@@ -766,13 +766,32 @@
             
             
             
-            // A wysiwyg editor -------------------------------------
+            // A wysiwyg editor ----------------------------------------------
             
             
             $('textarea.-ckeditor').first().ckeditor()
             
             
             
+            // Team invitation -----------------------------------------------
+            
+            
+            function inviteToTeam(msg) {
+                socketMain.add_message({
+                    format_type: 'add_message_contact',
+                    
+                    data: {
+                        sender_id: {{ request.user.pk }},
+                        recipent_id: {{ contractor.pk }},
+                        chat_message: msg,
+                    },
+                })
+            }
+            
+            window.inviteToTeam = inviteToTeam
+            
+            
+            
             //-----------------------------------------------------------------