paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 19:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add sender's domain to display recipient structures.

Browse Source 
(imported from commit 6ed2d869b36ad03eaa17eded57e7e46cf638dfd7)
This commit is contained in:
Tim Abbott
2013-05-02 12:56:42 -04:00
parent c02540bfa6
commit 4f6c46c090
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zephyr/models.py
View File

@@ -52,6 +52,7 @@ def get_display_recipient_memcached(recipient):
.select_related() .select_related()
.order_by('email')) .order_by('email'))
return [{'email': user_profile.email, return [{'email': user_profile.email,
'domain': user_profile.realm.domain,
'full_name': user_profile.full_name, 'full_name': user_profile.full_name,
'short_name': user_profile.short_name} for user_profile in user_profile_list] 'short_name': user_profile.short_name} for user_profile in user_profile_list]
@@ -277,6 +278,7 @@ class Message(models.Model):
# add the sender in if this isn't a message between # add the sender in if this isn't a message between
# someone and his self, preserving ordering # someone and his self, preserving ordering
recip = {'email': self.sender.email, recip = {'email': self.sender.email,
'domain': self.sender.realm.domain,
'full_name': self.sender.full_name, 'full_name': self.sender.full_name,
'short_name': self.sender.short_name}; 'short_name': self.sender.short_name};
if recip['email'] < display_recipient[0]['email']: if recip['email'] < display_recipient[0]['email']:
@@ -291,6 +293,7 @@ class Message(models.Model):
sender_email = self.sender.email, sender_email = self.sender.email,
sender_full_name = self.sender.full_name, sender_full_name = self.sender.full_name,
sender_short_name = self.sender.short_name, sender_short_name = self.sender.short_name,
sender_domain = self.sender.realm.domain,
type = display_type, type = display_type,
display_recipient = display_recipient, display_recipient = display_recipient,
recipient_id = self.recipient.id, recipient_id = self.recipient.id,
@@ -324,6 +327,7 @@ class Message(models.Model):
return dict( return dict(
id = self.id, id = self.id,
sender_email = self.sender.email, sender_email = self.sender.email,
sender_domain = self.sender.realm.domain,
sender_full_name = self.sender.full_name, sender_full_name = self.sender.full_name,
sender_short_name = self.sender.short_name, sender_short_name = self.sender.short_name,
sending_client = self.sending_client.name, sending_client = self.sending_client.name,