diff --git a/ChatServiceApp/js_views.py b/ChatServiceApp/js_views.py index 2815814..a7a3d5a 100644 --- a/ChatServiceApp/js_views.py +++ b/ChatServiceApp/js_views.py @@ -35,9 +35,33 @@ def send_msg_ajax(request): if 'ticket_id' in data: ticket = MsgGroup.objects.get(id=data['ticket_id']) + sender = User.objects.get(id=data['sender']) + receiver = User.objects.get(id=data['receiver']) + + # если только что манагер присоединился к тикету + if ticket and not ticket.manager: + if sender.is_staff: + ticket.manager = sender + else: + ticket.manager = receiver + + ticket.save() + + kwargs = { + 'sender': ticket.owner, + 'receiver': ticket.manager, + 'text': ticket.text + } + + if ticket: + kwargs.update({'group': ticket}) + + msg = Message.objects.create(**kwargs) + # ------------ + kwargs = { - 'sender': User.objects.get(id=data['sender']), - 'receiver': User.objects.get(id=data['receiver']), + 'sender': sender, + 'receiver': receiver, 'text': data['text'] } @@ -47,7 +71,6 @@ def send_msg_ajax(request): msg = Message.objects.create(**kwargs) - res_Dict.update({ 'ticket': ticket })