0.1.33
chat routines
This commit is contained in:
@@ -1,4 +1,27 @@
|
||||
from .models import *
|
||||
from django.db.models import Q
|
||||
|
||||
|
||||
def get_msgs_for_chat_w_users(user1, user2):
|
||||
|
||||
msgs = Message.objects.filter(
|
||||
Q(sender=user1) | Q(receiver=user1),
|
||||
Q(sender=user2) | Q(receiver=user2),
|
||||
group=None
|
||||
)
|
||||
return msgs
|
||||
|
||||
def get_chat_receivers_for_user(user):
|
||||
receivers = Message.objects.filter(
|
||||
Q(sender=user) | Q(receiver=user),
|
||||
group=None
|
||||
).order_by('-modifiedDT').values('sender', 'receiver')
|
||||
|
||||
receivers_list = []
|
||||
receivers_list.extend([item['sender'] for item in receivers if item['sender'] != user])
|
||||
receivers_list.extend([item['receiver'] for item in receivers if item['receiver'] != user])
|
||||
|
||||
return receivers_list
|
||||
|
||||
def get_messages_for_ticket(ticket):
|
||||
return ticket.rel_messages_for_group.filter(enable=True).order_by('-modifiedDT')
|
||||
|
||||
@@ -17,10 +17,12 @@ def get_msg_side(cur_user, ticket, msg):
|
||||
return 'right'
|
||||
else:
|
||||
return 'left'
|
||||
else:
|
||||
elif ticket:
|
||||
if ticket.owner == cur_user:
|
||||
return 'right'
|
||||
else:
|
||||
return 'left'
|
||||
else:
|
||||
return 'right'
|
||||
|
||||
# return 'left'
|
||||
Reference in New Issue
Block a user