management: Display organization owners in show_admins.

zerver/management/commands/show_admins.py

@@ -1,11 +1,11 @@
 from argparse import ArgumentParser
 from typing import Any
 
+from django.core.management.base import CommandError
 from zerver.lib.management import ZulipBaseCommand
 
-
 class Command(ZulipBaseCommand):
-    help = """Show the admins in a realm."""
+    help = """Show the owners and administrators in an organization."""
 
     def add_arguments(self, parser: ArgumentParser) -> None:
         self.add_realm_args(parser, required=True)
@@ -13,14 +13,20 @@ class Command(ZulipBaseCommand):
     def handle(self, *args: Any, **options: Any) -> None:
         realm = self.get_realm(options)
         assert realm is not None  # True because of required=True above
-        users = realm.get_admin_users_and_bots()
 
-        if users:
-            print('Admins:\n')
-            for user in users:
-                print('  %s (%s)' % (user.delivery_email, user.full_name))
+        admin_users = realm.get_admin_users_and_bots()
+        owner_user_ids = set(list(realm.get_human_owner_users().values_list("id", flat=True)))
+
+        if admin_users:
+            print('Administrators:\n')
+            for user in admin_users:
+                owner_detail = ""
+                if user.id in owner_user_ids:
+                    owner_detail = " [owner]"
+                print('  %s (%s)%s' % (user.delivery_email, user.full_name, owner_detail))
+
         else:
-            print('There are no admins for this realm!')
+            raise CommandError('There are no admins for this realm!')
 
         print('\nYou can use the "knight" management command to make more users admins.')
         print('\nOr with the --revoke argument, remove admin status from users.')