no need to check for deletedAlias when changing mailbox or user email
This commit is contained in:
parent
adce27b88b
commit
9bb17533c1
|
@ -51,7 +51,6 @@ def mailbox_detail_route(mailbox_id):
|
||||||
if (
|
if (
|
||||||
mailbox_already_used(new_email, current_user)
|
mailbox_already_used(new_email, current_user)
|
||||||
or Alias.get_by(email=new_email)
|
or Alias.get_by(email=new_email)
|
||||||
or DeletedAlias.get_by(email=new_email)
|
|
||||||
):
|
):
|
||||||
flash(f"Email {new_email} already used", "error")
|
flash(f"Email {new_email} already used", "error")
|
||||||
elif not email_domain_can_be_used_as_mailbox(new_email):
|
elif not email_domain_can_be_used_as_mailbox(new_email):
|
||||||
|
|
|
@ -73,10 +73,8 @@ def setting():
|
||||||
new_email = change_email_form.email.data
|
new_email = change_email_form.email.data
|
||||||
|
|
||||||
# check if this email is not already used
|
# check if this email is not already used
|
||||||
if (
|
if personal_email_already_used(new_email) or Alias.get_by(
|
||||||
personal_email_already_used(new_email)
|
email=new_email
|
||||||
or Alias.get_by(email=new_email)
|
|
||||||
or DeletedAlias.get_by(email=new_email)
|
|
||||||
):
|
):
|
||||||
flash(f"Email {new_email} already used", "error")
|
flash(f"Email {new_email} already used", "error")
|
||||||
elif not email_domain_can_be_used_as_mailbox(new_email):
|
elif not email_domain_can_be_used_as_mailbox(new_email):
|
||||||
|
|
Loading…
Reference in a new issue