Merge remote-tracking branch 'origin/main'

AuthApp/js_views.py

@@ -46,7 +46,7 @@ def support_tickets_ajax(request):
         tpl_name = 'blocks/profile/b_support_chat.html'
     else:
         from ChatServiceApp.models import MsgGroup
-        tickets = MsgGroup.objects.filter(enable=True, owner=request.user)
+        tickets = MsgGroup.objects.filter(enable=True, owner=request.user).order_by('-modifiedDT')
 
         Dict = {
             'tickets': tickets,

ChatServiceApp/js_views.py

@@ -102,21 +102,9 @@ def support_show_chat_by_ticket_ajax(request):
 
         ticket = MsgGroup.objects.get(id=data['ticket_id'])
 
-        # if request.user.is_staff:
-        if ticket.owner == request.user:
-            cur_user_ticket_side = 'right'
-        else:
-            cur_user_ticket_side = 'left'
-        # else:
-        #     if ticket.owner == request.user:
-        #         ticket_align_for_cur_user = 'right'
-        #     else:
-        #         ticket_align_for_cur_user = 'left'
-
         Dict = {
             'ticket': ticket,
             'messages': get_messages_for_ticket(ticket),
-            'cur_user_ticket_side': cur_user_ticket_side
         }
         Dict.update(get_ticketsDict_for_staff(request.user))