From 4f6c46c090f5cdf63f45b6389e5f9d38dc79eb44 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@humbughq.com>
Date: Thu, 2 May 2013 12:56:42 -0400
Subject: [PATCH] Add sender's domain to display recipient structures.

(imported from commit 6ed2d869b36ad03eaa17eded57e7e46cf638dfd7)
---
 zephyr/models.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/zephyr/models.py b/zephyr/models.py
index 3cbd59e7be..a6dec6a18d 100644
--- a/zephyr/models.py
+++ b/zephyr/models.py
@@ -52,6 +52,7 @@ def get_display_recipient_memcached(recipient):
                                             .select_related()
                                             .order_by('email'))
     return [{'email': user_profile.email,
+             'domain': user_profile.realm.domain,
              'full_name': user_profile.full_name,
              '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
                 # someone and his self, preserving ordering
                 recip = {'email': self.sender.email,
+                         'domain': self.sender.realm.domain,
                          'full_name': self.sender.full_name,
                          'short_name': self.sender.short_name};
                 if recip['email'] < display_recipient[0]['email']:
@@ -291,6 +293,7 @@ class Message(models.Model):
             sender_email      = self.sender.email,
             sender_full_name  = self.sender.full_name,
             sender_short_name = self.sender.short_name,
+            sender_domain     = self.sender.realm.domain,
             type              = display_type,
             display_recipient = display_recipient,
             recipient_id      = self.recipient.id,
@@ -324,6 +327,7 @@ class Message(models.Model):
         return dict(
             id                = self.id,
             sender_email      = self.sender.email,
+            sender_domain     = self.sender.realm.domain,
             sender_full_name  = self.sender.full_name,
             sender_short_name = self.sender.short_name,
             sending_client    = self.sending_client.name,