Fix voiding of preexisting recipients

modoboa/admin/forms/account.py

@@ -425,7 +425,7 @@ class AccountFormMail(forms.Form, DynamicForm):
                 domain=models.Domain.objects.get(name=domname),
                 defaults={'enabled': account.is_active},
             )
-            al.set_recipients([self.mb.full_address])
+            al.add_recipients([self.mb.full_address])
             al.post_create(user)
 
     def _update_sender_addresses(self):

modoboa/admin/models/alias.py

@@ -137,8 +137,8 @@ class Alias(AdminObject):
             for admin in self.domain.admins:
                 grant_access_to_object(admin, self)
 
-    def set_recipients(self, address_list):
-        """Set recipients for this alias.
+    def add_recipients(self, address_list):
+        """Add recipients for this alias.
 
         Special recipients:
         * local mailbox + extension: r_mailbox will be set to local mailbox
@@ -187,6 +187,11 @@ class Alias(AdminObject):
                     kwargs["r_mailbox"] = rcpt
             AliasRecipient(**kwargs).save()
 
+    def set_recipients(self, address_list):
+        """Set recipients for this alias."""
+
+        self.add_recipients(address_list)
+
         # Remove old recipients
         self.aliasrecipient_set.exclude(
             address__in=address_list).delete()

modoboa/admin/tests/test_account.py

@@ -133,6 +133,7 @@ class AccountTestCase(ModoTestCase):
             "aliases": "alias@test.com",
         }
         self.ajax_post(reverse("admin:account_add"), values)
+        self.assertTrue(alias.aliasrecipient_set.count() == 2)
 
     def test_aliases_update_on_disable(self):
         """Check if aliases are updated when account is disabled."""