From 1e7a22f14e9f67702789f207c22ecc2629483b0f Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Tue, 3 Dec 2013 14:31:47 -0500 Subject: [PATCH] Replace other non-zerver uses of iPhone client (imported from commit 0988e2c9bd0499a0711daed97f89aa672776f085) --- analytics/management/commands/realm_stats.py | 2 +- analytics/views.py | 4 ++-- zerver/tests.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/analytics/management/commands/realm_stats.py b/analytics/management/commands/realm_stats.py index f87a1d82d1..ad059bf7a5 100644 --- a/analytics/management/commands/realm_stats.py +++ b/analytics/management/commands/realm_stats.py @@ -8,7 +8,7 @@ from django.db.models import Count from zerver.models import UserProfile, Realm, Stream, Message, Recipient, UserActivity, \ Subscription, UserMessage -MOBILE_CLIENT_LIST = ["Android", "iPhone"] +MOBILE_CLIENT_LIST = ["Android", "ios"] HUMAN_CLIENT_LIST = MOBILE_CLIENT_LIST + ["website"] human_messages = Message.objects.filter(sending_client__name__in=HUMAN_CLIENT_LIST) diff --git a/analytics/views.py b/analytics/views.py index 46e108e6f9..6695d45d10 100644 --- a/analytics/views.py +++ b/analytics/views.py @@ -745,7 +745,7 @@ def realm_user_summary_table(all_records, admin_emails): sent_count = get_count(user_summary, 'send') cells = [user_summary['name'], email_link, sent_count] row_class = '' - for field in ['use', 'send', 'pointer', 'desktop', 'iPhone', 'Android']: + for field in ['use', 'send', 'pointer', 'desktop', 'ios', 'Android']: val = get_last_visit(user_summary, field) if field == 'use': if val and is_recent(val): @@ -770,7 +770,7 @@ def realm_user_summary_table(all_records, admin_emails): 'Message sent', 'Pointer motion', 'Desktop', - 'iPhone', + 'ios', 'Android' ] diff --git a/zerver/tests.py b/zerver/tests.py index 4d9863c4a4..6322be6ec4 100644 --- a/zerver/tests.py +++ b/zerver/tests.py @@ -377,12 +377,12 @@ class WorkerTest(TestCase): user = get_user_profile_by_email('hamlet@zulip.com') UserActivity.objects.filter( user_profile = user.id, - client = get_client('iPhone') + client = get_client('ios') ).delete() data = dict( user_profile_id = user.id, - client = 'iPhone', + client = 'ios', time = time.time(), query = 'send_message' ) @@ -393,7 +393,7 @@ class WorkerTest(TestCase): worker.start() activity_records = UserActivity.objects.filter( user_profile = user.id, - client = get_client('iPhone') + client = get_client('ios') ) self.assertTrue(len(activity_records), 1) self.assertTrue(activity_records[0].count, 1)