CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-15 21:03:26 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Use full emails rather than just usernames in /activity.

Browse Source 
(imported from commit c0397d6429fe85f0bd6e57731dd2132ed1e11b85)
This commit is contained in:
Luke Faraone 2013-02-11 10:33:16 -05:00
parent 0cbe53b9c7
commit 8dbda2cd64
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zephyr/activity.html
View File

@ -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>

2
zephyr/views.py
View File

@ -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