From 94e0ef6ee123b0aad50509b47995dc1374488ec0 Mon Sep 17 00:00:00 2001 From: SDE Date: Wed, 2 Aug 2023 19:43:52 +0300 Subject: [PATCH] 0.1.29 chat routines --- AuthApp/js_views.py | 2 +- ChatServiceApp/js_views.py | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/AuthApp/js_views.py b/AuthApp/js_views.py index 12277d5..4d51687 100644 --- a/AuthApp/js_views.py +++ b/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, diff --git a/ChatServiceApp/js_views.py b/ChatServiceApp/js_views.py index 50578c5..e823aca 100644 --- a/ChatServiceApp/js_views.py +++ b/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))