paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

models: Extract get_human_admin_users function.

Browse Source 
This function is an alternative to get_admin_users that we use in all
places where we explicitly want only human administrative users (not
administrative bots).  The following commits will rename
get_admin_users for better clarity.
This commit is contained in:
Tim Abbott
2019-06-20 14:26:54 -07:00
parent aa217efdbe
commit 4eb9d67b70
7 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
analytics/views.py
View File

@@ -1077,8 +1077,10 @@ def support(request: HttpRequest) -> HttpResponse:
if users:
for user in users:
user.realm.realm_icon_url = realm_icon_url(user.realm)
user.realm.admin_emails = ", ".join(user.realm.get_admin_users().values_list("email",
flat=True))
user.realm.admin_emails = ", ".join(
user.realm.get_human_admin_users().values_list(
"email",
flat=True))
user.realm.default_discount = get_discount_for_realm(user.realm)
context["users"] = users
@@ -1102,7 +1104,7 @@ def support(request: HttpRequest) -> HttpResponse:
if realms:
for realm in realms:
realm.realm_icon_url = realm_icon_url(realm)
realm.admin_emails = ", ".join(realm.get_admin_users().values_list("email", flat=True))
realm.admin_emails = ", ".join(realm.get_human_admin_users().values_list("email", flat=True))
realm.default_discount = get_discount_for_realm(realm)
context["realms"] = realms
return render(request, 'analytics/support.html', context=context)
@@ -1383,7 +1385,7 @@ def get_realm_activity(request: HttpRequest, realm_str: str) -> HttpResponse:
all_user_records = {} # type: Dict[str, Any]
try:
admins = Realm.objects.get(string_id=realm_str).get_admin_users()
admins = Realm.objects.get(string_id=realm_str).get_human_admin_users()
except Realm.DoesNotExist:
return HttpResponseNotFound("Realm %s does not exist" % (realm_str,))