0.1.24

send msg

AuthApp/js_views.py

@@ -41,11 +41,8 @@ def support_tickets_ajax(request):
         raise Http404
 
     if request.user.is_staff:
-        from ChatServiceApp.funcs import get_tickets_for_manager, get_tickets_wo_manager
+        from ChatServiceApp.funcs import get_ticketsDict_for_staff
-        Dict = {
+        Dict = get_ticketsDict_for_staff(request.user)
-            'tickets_wo_manager': get_tickets_wo_manager(),
-            'tickets_for_manager': get_tickets_for_manager(request.user),
-        }
         tpl_name = 'blocks/profile/b_support_chat.html'
     else:
         from ChatServiceApp.models import MsgGroup

ChatServiceApp/funcs.py

@@ -1,5 +1,12 @@
 from .models import *
 
+def get_ticketsDict_for_staff(user):
+    Dict = {
+        'tickets_wo_manager': get_tickets_wo_manager(),
+        'tickets_for_manager': get_tickets_for_manager(user),
+    }
+    return Dict
+
 def get_tickets_wo_manager():
 
     tickets = MsgGroup.objects.filter(enable=True, manager=None)

ChatServiceApp/js_views.py

@@ -102,6 +102,7 @@ def support_show_chat_by_ticket_ajax(request):
         Dict = {
             'ticket': obj
         }
+        Dict.update(get_ticketsDict_for_staff(request.user))
 
         tpl_name = 'blocks/profile/b_support_chat.html'
 

templates/blocks/profile/b_support_chat.html

@@ -9,6 +9,8 @@
     <div class="title-profile-cont">
         <h1>Техническая поддержка</h1>
     </div>
+
+    {% if ticket %}
         <div class="name_ticket">
             <span>{{ ticket.name }}</span>
         </div>
@@ -51,8 +53,8 @@
                     </div>
                 </div>
             {% endif %}
-
         </div>
+    {% endif %}
     {% if user.is_staff %}
         <div class="block-list-of-users">
             <span class="title-list-of-users">Неразобранные тикеты</span>

templates/widgets/w_message.html

@@ -1,6 +1,6 @@
 {% load static %}
 
-<div class="container-message_support_chat{% if msg.sender == user %} right{% else %} left{% endif %}">
+<div class="container-message_support_chat{% if msg.sender == user or ticket.owner != user %} right{% else %} left{% endif %}">
     <div class="block_avatar_message{% if msg.sender == ticket.manager %} left{% else %} right{% endif %}">
         <img src="{% static "delete_later/Avatar.png" %}">
     </div>