sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
borissedw
2023-08-08 18:23:13 +03:00
parent 48e0e36f91 29bdb33466
commit b3ea94db3d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChatServiceApp/js_views.py
View File

@@ -29,9 +29,12 @@ def show_chat_w_user_ajax(request):
from AuthApp.models import User from AuthApp.models import User
cur_receiver = User.objects.get(id=data['user_id']) cur_receiver = User.objects.get(id=data['user_id'])
receivers = get_chat_receivers_for_user(request.user)
Dict = { Dict = {
'cur_receiver': cur_receiver, 'cur_receiver': cur_receiver,
'messages': get_msgs_for_chat_w_users(request.user, cur_receiver), 'messages': get_msgs_for_chat_w_users(request.user, cur_receiver),
'receivers': receivers,
} }
tpl_name = 'blocks/profile/b_chats.html' tpl_name = 'blocks/profile/b_chats.html'
@@ -87,7 +90,7 @@ def update_chat_ajax(request):
if (not msgs and not last_message_modifiedDT) or (msgs and last_message_modifiedDT and msgs[0].modifiedDT <= last_message_modifiedDT): if (not msgs and not last_message_modifiedDT) or (msgs and last_message_modifiedDT and msgs[0].modifiedDT <= last_message_modifiedDT):
Dict.update({ Dict.update({
'msgs_count': len(msgs) 'required_beep': False
}) })
return JsonResponse(Dict, status=200) return JsonResponse(Dict, status=200)
@@ -102,7 +105,7 @@ def update_chat_ajax(request):
Dict.update({ Dict.update({
'html': html, 'html': html,
'msgs_count': len(msgs) 'required_beep': True,
}) })
return JsonResponse(Dict, status=200) return JsonResponse(Dict, status=200)