From a6383a881f1cb6b40b460aae2d16a397b38b51af Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Fri, 1 Nov 2013 16:01:14 -0400 Subject: [PATCH] Split out bots on /realm_activity. (imported from commit 5962646f4d76c95078a24de7fc22334597ff206f) --- zerver/views/__init__.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py index 1e86fbb674..83cbb84f0e 100644 --- a/zerver/views/__init__.py +++ b/zerver/views/__init__.py @@ -2393,7 +2393,7 @@ def get_activity(request, realm=REQ(default=None)): context_instance=RequestContext(request) ) -def get_user_activity_records_for_realm(realm): +def get_user_activity_records_for_realm(realm, is_bot): fields = [ 'user_profile__full_name', 'user_profile__email', @@ -2404,7 +2404,8 @@ def get_user_activity_records_for_realm(realm): ] 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.select_related('user_profile', 'client').only(*fields) @@ -2604,14 +2605,17 @@ def realm_user_summary_table(all_records): @zulip_internal def get_realm_activity(request, realm): - all_records = get_user_activity_records_for_realm(realm) - all_records = list(all_records) - data = [] - content = realm_user_summary_table(all_records) - user_content = dict(content=content) - data += [('Summary', user_content)] + 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) + + content = realm_user_summary_table(all_records) + + user_content = dict(content=content) + + data += [(page_title, user_content)] realm = None title = realm