paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

activity: Use realm owners, not realm administrators.

Browse Source 
The analytics system was not properly updated when we replaced realm
owners with realm administrators.
This commit is contained in:
Tim Abbott
2021-04-08 17:29:05 -07:00
parent e0b1818780
commit 6b1ca15ba7
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
analytics/management/commands/populate_analytics_db.py
View File

@@ -83,9 +83,9 @@ class Command(BaseCommand):
"Shylock",
realm,
full_name="Shylock",
role=UserProfile.ROLE_REALM_ADMINISTRATOR,
role=UserProfile.ROLE_REALM_OWNER,
)
do_change_user_role(shylock, UserProfile.ROLE_REALM_ADMINISTRATOR, acting_user=None)
do_change_user_role(shylock, UserProfile.ROLE_REALM_OWNER, acting_user=None)
stream = Stream.objects.create(name="all", realm=realm, date_created=installation_time)
recipient = Recipient.objects.create(type_id=stream.id, type=Recipient.STREAM)
stream.recipient = recipient

10
analytics/views.py
View File

@@ -736,19 +736,19 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
cursor.close()
# Fetch all the realm administrator users
realm_admins: Dict[str, List[str]] = defaultdict(list)
realm_owners: Dict[str, List[str]] = defaultdict(list)
for up in UserProfile.objects.select_related("realm").filter(
role=UserProfile.ROLE_REALM_ADMINISTRATOR,
role=UserProfile.ROLE_REALM_OWNER,
is_active=True,
):
realm_admins[up.realm.string_id].append(up.delivery_email)
realm_owners[up.realm.string_id].append(up.delivery_email)
for row in rows:
row["date_created_day"] = row["date_created"].strftime("%Y-%m-%d")
row["plan_type_string"] = get_plan_name(row["plan_type"])
row["age_days"] = int((now - row["date_created"]).total_seconds() / 86400)
row["is_new"] = row["age_days"] < 12 * 7
row["realm_admin_email"] = ", ".join(realm_admins[row["string_id"]])
row["realm_owner_emails"] = ", ".join(realm_owners[row["string_id"]])
# get messages sent per day
counts = get_realm_day_counts()
@@ -810,7 +810,7 @@ def realm_summary_table(realm_minutes: Dict[str, float]) -> str:
amount=total_amount,
stats_link="",
date_created_day="",
realm_admin_email="",
realm_owner_emails="",
dau_count=total_dau_count,
user_profile_count=total_user_profile_count,
bot_count=total_bot_count,

2
templates/analytics/realm_summary_table.html
View File

@@ -62,7 +62,7 @@
<td>
{% if not loop.last %}
<a class="envelope-link" data-admin-emails="{{ row.realm_admin_email }}">
<a class="envelope-link" data-admin-emails="{{ row.realm_owner_emails }}">
<i class="fa fa-envelope"></i>
</a>
{% endif %}