github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adding support for alias -> alias import.

Browse Source
This commit is contained in:
Antoine Nguyen
2013-06-19 15:12:07 +02:00
parent c030ec4e75
commit 9dd1859441
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/models.py
+13 -4
View File
@@ -1138,6 +1138,9 @@ class Alias(DatesAware):
return False
def from_csv(self, user, row, expected_elements=5):
"""Create a new alias from a CSV file entry
"""
if len(row) < expected_elements:
raise AdminError(_("Invalid line: %s" % row))
localpart, domname = split_mailbox(row[1].strip())
@@ -1161,10 +1164,16 @@ class Alias(DatesAware):
ext_rcpts += [rcpt]
continue
try:
int_rcpts += [Mailbox.objects.get(address=localpart,
domain__name=domname)]
except Mailbox.DoesNotExist:
raise AdminError(_("Mailbox %s does not exist" % rcpt))
rcpt = Alias.objects.get(domain=domname, address=localpart)
except Alias.DoesNotExist:
rcpt = None
if rcpt is None:
try:
rcpt = Mailbox.objects.get(address=localpart,
domain__name=domname)
except Mailbox.DoesNotExist:
raise AdminError(_("Local recipient %s not found" % rcpt))
int_rcpts += [rcpt]
self.save(int_rcpts, ext_rcpts, creator=user)
def to_csv(self, csvwriter):