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

forms: Fix accounts listed in password_reset email to active accounts.

Browse Source 
Previously we were listing both accounts, active as well as non-active.
Fixes: #10130.
This commit is contained in:
Shubham Dhama
2018-08-04 17:37:54 +05:30
committed by Tim Abbott
parent ab22b4411f
commit 2dec30e4ab
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/forms.py
View File

@@ -249,10 +249,10 @@ class ZulipPasswordResetForm(PasswordResetForm):
context=context)
else:
context['no_account_in_realm'] = True
accounts = UserProfile.objects.filter(email__iexact=email)
if accounts:
context['accounts'] = accounts
context['multiple_accounts'] = accounts.count() != 1
active_accounts = UserProfile.objects.filter(email__iexact=email, is_active=True)
if active_accounts:
context['active_accounts'] = active_accounts
context['multiple_active_accounts'] = active_accounts.count() != 1
send_email('zerver/emails/password_reset', to_email=email,
from_name="Zulip Account Security",
from_address=FromAddress.tokenized_no_reply_address(),