fix the case public domain is also a custom domain for a specific user: check for public domain first.
This commit is contained in:
parent
f5e6f541ff
commit
1bbc416ec1
|
@ -162,7 +162,16 @@ def setting():
|
|||
|
||||
elif request.form.get("form-name") == "change-random-alias-default-domain":
|
||||
default_domain = request.form.get("random-alias-default-domain")
|
||||
|
||||
if default_domain:
|
||||
public_domain = PublicDomain.get_by(domain=default_domain)
|
||||
if public_domain:
|
||||
# make sure only default_random_alias_domain_id or default_random_alias_public_domain_id is set
|
||||
current_user.default_random_alias_public_domain_id = (
|
||||
public_domain.id
|
||||
)
|
||||
current_user.default_random_alias_domain_id = None
|
||||
else:
|
||||
custom_domain = CustomDomain.get_by(domain=default_domain)
|
||||
if custom_domain:
|
||||
# sanity check
|
||||
|
@ -174,19 +183,16 @@ def setting():
|
|||
"%s cannot use domain %s", current_user, default_domain
|
||||
)
|
||||
else:
|
||||
# make sure only default_random_alias_domain_id or default_random_alias_public_domain_id is set
|
||||
current_user.default_random_alias_domain_id = custom_domain.id
|
||||
current_user.default_random_alias_public_domain_id = None
|
||||
else:
|
||||
public_domain = PublicDomain.get_by(domain=default_domain)
|
||||
if public_domain:
|
||||
# make sure only default_random_alias_domain_id or default_random_alias_public_domain_id is set
|
||||
current_user.default_random_alias_public_domain_id = (
|
||||
public_domain.id
|
||||
# make sure only default_random_alias_domain_id or
|
||||
# default_random_alias_public_domain_id is set
|
||||
current_user.default_random_alias_domain_id = (
|
||||
custom_domain.id
|
||||
)
|
||||
current_user.default_random_alias_domain_id = None
|
||||
current_user.default_random_alias_public_domain_id = None
|
||||
|
||||
else:
|
||||
current_user.default_random_alias_domain_id = None
|
||||
current_user.default_random_alias_public_domain_id = None
|
||||
|
||||
db.session.commit()
|
||||
flash("Your preference has been updated", "success")
|
||||
|
|
Loading…
Reference in a new issue