salim
/
newosinadjango
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrw

Browse Source
main
emile 8 months ago
parent 6f74287a40
commit c12bc1f58e
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File

26
osinaweb/osichat/consumers.py
Unescape Escape View File

@ -577,12 +577,13 @@ class OsitcomChatRoom(WebsocketConsumer):
message_data = model_to_dict(message) message_data = model_to_dict(message)
attachment = getattr(message, 'chatmessageattachment', None) attachment = getattr(message, 'chatmessageattachment', None)
member = message.member member = message.member
message_data['member'] = { if member:
'id': member.id, message_data['member'] = {
'first_name': member.first_name, 'id': member.id,
'last_name': member.last_name, 'first_name': member.first_name,
'image': member.staffprofile.image 'last_name': member.last_name,
} 'image': member.staffprofile.image
}
if attachment: if attachment:
message_data['attachment'] = { message_data['attachment'] = {
'attachment': attachment.attachment, 'attachment': attachment.attachment,
@ -692,12 +693,13 @@ class OsitcomChatRoom(WebsocketConsumer):
if self.client_type == 'mobile_admin': if self.client_type == 'mobile_admin':
chat_message_data = model_to_dict(chat_message) chat_message_data = model_to_dict(chat_message)
member = chat_message.member member = chat_message.member
chat_message_data['member'] = { if member:
'id': member.id, chat_message_data['member'] = {
'first_name': member.first_name, 'id': member.id,
'last_name': member.last_name, 'first_name': member.first_name,
'image': member.staffprofile.image 'last_name': member.last_name,
} 'image': member.staffprofile.image
}
self.send(text_data=json.dumps({ self.send(text_data=json.dumps({
'event_type': 'send_message', 'event_type': 'send_message',
'chat_message_data': chat_message_data, 'chat_message_data': chat_message_data,

Write Preview
Loading…
Cancel
Save