paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

soft-deactivation: Raise exception with all missing emails at once.

Browse Source
This commit is contained in:
Puneeth Chaganti
2019-03-12 07:05:31 +05:30
committed by Tim Abbott
parent 82d9789d93
commit 7f06f6bd73
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
zerver/management/commands/soft_deactivate_users.py
View File

@@ -1,4 +1,3 @@
import sys import sys
from argparse import ArgumentParser from argparse import ArgumentParser
from typing import Any, Dict from typing import Any, Dict
@@ -59,11 +58,10 @@ class Command(ZulipBaseCommand):
users_to_activate = list(users_to_activate) users_to_activate = list(users_to_activate)
if len(users_to_activate) != len(user_emails): if len(users_to_activate) != len(user_emails):
user_emails_found = [user.email for user in users_to_activate] user_emails_found = {user.email for user in users_to_activate}
for user in user_emails: user_emails_not_found = ', '.join(set(user_emails) - user_emails_found)
if user not in user_emails_found: raise Exception('Users with emails %s were not found. '
raise Exception('User with email %s was not found. ' 'Check if they are correct.' % (user_emails_not_found))
'Check if the email is correct.' % (user))
users_activated = do_soft_activate_users(users_to_activate) users_activated = do_soft_activate_users(users_to_activate)
logger.info('Soft Reactivated %d user(s)' % (len(users_activated))) logger.info('Soft Reactivated %d user(s)' % (len(users_activated)))
@@ -76,11 +74,11 @@ class Command(ZulipBaseCommand):
users_to_deactivate = list(users_to_deactivate) users_to_deactivate = list(users_to_deactivate)
if len(users_to_deactivate) != len(user_emails): if len(users_to_deactivate) != len(user_emails):
user_emails_found = [user.email for user in users_to_deactivate] user_emails_found = {user.email for user in users_to_deactivate}
for user in user_emails: user_emails_not_found = ', '.join(set(user_emails) - user_emails_found)
if user not in user_emails_found: raise Exception('Users with emails %s were not found. '
raise Exception('User with email %s was not found. ' 'Check if they are correct.' % (user_emails_not_found))
'Check if the email is correct.' % (user,))
print('Soft deactivating forcefully...') print('Soft deactivating forcefully...')
else: else:
if realm is not None: if realm is not None: