github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-20 06:08:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Include target port in import/export.

Browse Source
This commit is contained in:
Antoine Nguyen
2017-01-16 17:38:33 +01:00
parent dc5155ee68
commit e1b19b78db
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/templates/admin/import_domains_form.html
+1 -1
View File
@@ -8,7 +8,7 @@
<ul>
<li><em>domain; name; quota; enabled</em></li>
<li><em>domainalias; name; targeted domain; enabled</em></li>
<li><em>relaydomain; name; target host; service; enabled; verify recipients</em></li>
<li><em>relaydomain; name; target host; target port; service; enabled; verify recipients</em></li>
</ul>
<p>The first element of each line is mandatory and must be equal to one of the previous values.</p>
<p>You can use a different character as separator.</p>
modoboa/relaydomains/models.py
+7 -5
View File
@@ -106,7 +106,8 @@ class RelayDomain(admin_models.AdminObject):
"""
csvwriter.writerow(
["relaydomain", self.domain.name, self.target_host,
self.service.name, self.domain.enabled, self.verify_recipients]
self.target_port, self.service.name, self.domain.enabled,
self.verify_recipients]
)
for dalias in self.domain.domainalias_set.all():
dalias.to_csv(csvwriter)
@@ -117,17 +118,18 @@ class RelayDomain(admin_models.AdminObject):
:param user: user importing the relay domain
:param str row: relay domain definition
"""
if len(row) != 6:
if len(row) != 7:
raise BadRequest(_("Invalid line"))
self.domain = admin_models.Domain(
name=row[1].strip(), type="relaydomain", quota=0,
enabled=(row[4].strip() in ["True", "1", "yes", "y"])
enabled=(row[5].strip() in ["True", "1", "yes", "y"])
)
self.domain.save(creator=user)
self.target_host = row[2].strip()
self.target_port = row[3].strip()
self.service, created = Service.objects.get_or_create(
name=row[3].strip())
self.verify_recipients = (row[5].strip() in ["True", "1", "yes", "y"])
name=row[4].strip())
self.verify_recipients = (row[6].strip() in ["True", "1", "yes", "y"])
self.save(creator=user)