mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-11-16 09:34:03 +01:00
Fixed alias, fixed urls.py
This commit is contained in:
@@ -543,7 +543,7 @@ class WritableAccountSerializer(v1_serializers.WritableAccountSerializer):
|
||||
self.set_permissions(user, domains)
|
||||
if aliases:
|
||||
for alias in aliases:
|
||||
models.alias.modify_or_create_alias(
|
||||
models.Alias.objects.modify_or_create(
|
||||
address="{}@{}".format(alias["localpart"], alias["domain"]),
|
||||
recipients=[user.username],
|
||||
creator=creator,
|
||||
@@ -577,7 +577,7 @@ class WritableAccountSerializer(v1_serializers.WritableAccountSerializer):
|
||||
alias_recipients = instance.mailbox.alias_addresses
|
||||
for alias in aliases:
|
||||
address = "{}@{}".format(alias["localpart"], alias["domain"])
|
||||
models.alias.modify_or_create_alias(
|
||||
models.Alias.objects.modify_or_create(
|
||||
address=address,
|
||||
recipients=[validated_data["username"]],
|
||||
creator=creator,
|
||||
|
||||
@@ -70,7 +70,7 @@ class AliasManager(models.Manager):
|
||||
alias.set_recipients(recipients)
|
||||
return alias
|
||||
|
||||
def modify_or_create_alias(self, address, recipients, creator, domain):
|
||||
def modify_or_create(self, address, recipients, creator, domain):
|
||||
"""Add recipient if the alias already exists or create it."""
|
||||
|
||||
alias = Alias.objects.filter(address=address, internal=False)
|
||||
|
||||
Reference in New Issue
Block a user