From 8dbda2cd64e1ce9de64eda234b7fd6ee3b2c5347 Mon Sep 17 00:00:00 2001
From: Luke Faraone <lfaraone@humbughq.com>
Date: Mon, 11 Feb 2013 10:33:16 -0500
Subject: [PATCH] Use full emails rather than just usernames in /activity.

(imported from commit c0397d6429fe85f0bd6e57731dd2132ed1e11b85)
---
 templates/zephyr/activity.html | 2 +-
 zephyr/views.py                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/zephyr/activity.html b/templates/zephyr/activity.html
index b672f8acac..7af246d406 100644
--- a/templates/zephyr/activity.html
+++ b/templates/zephyr/activity.html
@@ -43,7 +43,7 @@
     {% for email, row in activity.sorted_rows %}
         <tr class="{{ row.class }}">
         <td><strong>{{ row.full_name }}</strong></td>
-        <td><strong>{{ row.username }}</strong></td>
+        <td><strong>{{ row.email }}</strong></td>
         <td><strong>{{ row.realm }}</strong></td>
         <td sorttable_customkey="{{ row.get_updates_last|date:'YmdHi' }}">{{ row.get_updates_last }}</td>
         <td sorttable_customkey="{{ row.send_message_last|date:'YmdHi' }}">{{ row.send_message_last }}</td>
diff --git a/zephyr/views.py b/zephyr/views.py
index ef4fd719ac..581ba39f9e 100644
--- a/zephyr/views.py
+++ b/zephyr/views.py
@@ -1203,7 +1203,7 @@ class ActivityTable(object):
                 row = self.rows.setdefault(record.user_profile.user.email, {})
                 row['realm'] = record.user_profile.realm.domain
                 row['full_name'] = record.user_profile.full_name
-                row['username'] = record.user_profile.user.email.split('@')[0]
+                row['email'] = record.user_profile.user.email
                 row[query_name + '_count'] = record.count
                 row[query_name + '_last' ] = record.last_visit