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

Split out bots on /realm_activity.

Browse Source 
(imported from commit 5962646f4d76c95078a24de7fc22334597ff206f)
This commit is contained in:
Steve Howell
2013-11-01 16:01:14 -04:00
parent ca8187b8cf
commit a6383a881f
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/views/__init__.py
View File

@@ -2393,7 +2393,7 @@ def get_activity(request, realm=REQ(default=None)):
context_instance=RequestContext(request) context_instance=RequestContext(request)
) )
def get_user_activity_records_for_realm(realm): def get_user_activity_records_for_realm(realm, is_bot):
fields = [ fields = [
'user_profile__full_name', 'user_profile__full_name',
'user_profile__email', 'user_profile__email',
@@ -2404,7 +2404,8 @@ def get_user_activity_records_for_realm(realm):
] ]
records = UserActivity.objects.filter( records = UserActivity.objects.filter(
user_profile__realm__domain=realm user_profile__realm__domain=realm,
user_profile__is_bot=is_bot
) )
records = records.order_by("user_profile__email", "-last_visit") records = records.order_by("user_profile__email", "-last_visit")
records = records.select_related('user_profile', 'client').only(*fields) records = records.select_related('user_profile', 'client').only(*fields)
@@ -2604,14 +2605,17 @@ def realm_user_summary_table(all_records):
@zulip_internal @zulip_internal
def get_realm_activity(request, realm): def get_realm_activity(request, realm):
all_records = get_user_activity_records_for_realm(realm) data = []
for is_bot, page_title in [(False, 'Humans'), (True, 'Bots')]:
all_records = get_user_activity_records_for_realm(realm, is_bot)
all_records = list(all_records) all_records = list(all_records)
data = []
content = realm_user_summary_table(all_records) content = realm_user_summary_table(all_records)
user_content = dict(content=content) user_content = dict(content=content)
data += [('Summary', user_content)]
data += [(page_title, user_content)]
realm = None realm = None
title = realm title = realm