{% trans "Administrators" %}
-
-
+
+
| {% trans "Username" %} | {% trans "Name" %} | |
|---|
- {% for da in domain.admins %}
-
- | {{ da.username }} |
- {{ da.fullname }} |
-
- {% if perms.admin.change_domain %}
-
- {% endif %}
- |
-
- {% empty %}
- | {% trans "No domain administrator defined yet." %} |
- {% endfor %}
-
-
+
+
+ {% for da in domain.admins %}
+
+ | {{ da.username }} |
+ {{ da.fullname }} |
+
+ {% if perms.admin.change_domain %}
+
+ {% endif %}
+ |
+
+ {% empty %}
+ | {% trans "No domain administrator defined yet." %} |
+ {% endfor %}
+
+
{% for template in templates.right %}
diff --git a/modoboa/admin/templates/admin/domain_general_form.html b/modoboa/admin/templates/admin/domain_general_form.html
index 06c2590b1..4caca3a92 100644
--- a/modoboa/admin/templates/admin/domain_general_form.html
+++ b/modoboa/admin/templates/admin/domain_general_form.html
@@ -2,6 +2,7 @@
{% render_field form.name %}
{% render_field form.type %}
{% render_field form.quota appended_text=_("MB") %}
+{% render_field form.default_mailbox_quota appended_text=_("MB") %}
{% render_fields_group form "aliases" %}
{% render_field form.enabled %}
{% render_field form.enable_dns_checks %}
diff --git a/modoboa/admin/templates/admin/import_domains_form.html b/modoboa/admin/templates/admin/import_domains_form.html
index 5a8666ef5..28fe99dea 100644
--- a/modoboa/admin/templates/admin/import_domains_form.html
+++ b/modoboa/admin/templates/admin/import_domains_form.html
@@ -6,7 +6,7 @@
{% blocktrans trimmed %}
Provide a CSV file where lines respect one of the following formats:
- - domain; name; quota; enabled
+ - domain; name; quota; default mailbox quota; enabled
- domainalias; name; targeted domain; enabled
- relaydomain; name; target host; target port; service; enabled; verify recipients
diff --git a/modoboa/admin/tests/test_account.py b/modoboa/admin/tests/test_account.py
index 334effba5..f8b9478a2 100644
--- a/modoboa/admin/tests/test_account.py
+++ b/modoboa/admin/tests/test_account.py
@@ -165,17 +165,34 @@ class AccountTestCase(ModoTestCase):
self._set_quota("user@test.com", 0)
def test_set_nul_quota_as_domainadmin(self):
+ """Check cases where a domain admin set unlimited quota."""
self.client.logout()
self.assertTrue(
self.client.login(username="admin@test.com", password="toto")
)
+ # Fails because domain has a quota
self._set_quota("user@test.com", 0, 400)
self.client.logout()
self.assertTrue(
self.client.login(username="admin@test2.com", password="toto")
)
+ # Ok because domain has no quota
self._set_quota("user@test2.com", 0)
+ def test_domain_quota(self):
+ """Check domain quota."""
+ dom = models.Domain.objects.get(name="test.com")
+ dom.quota = 100
+ dom.save(update_fields=["quota"])
+ # 2 x 10MB
+ self.assertEqual(dom.quota_usage, 20)
+ self._set_quota("user@test.com", 80)
+ del dom.quota_usage
+ # 10 + 80 < 100 => ok
+ self.assertEqual(dom.quota_usage, 90)
+ # 30 + 80 > 100 => failure
+ self._set_quota("admin@test.com", 30, 400)
+
def test_master_user(self):
"""Validate the master user mode."""
values = {
@@ -250,11 +267,15 @@ class PermissionsTestCase(ModoTestCase):
cls.reseller = core_factories.UserFactory(username="reseller")
cls.reseller.role = "Resellers"
cls.user = User.objects.get(username="user@test.com")
- cls.values = dict(
- username=cls.user.username, role="DomainAdmins",
- is_active=cls.user.is_active, email="user@test.com",
- quota_act=True
- )
+
+ def setUp(self):
+ """Initiate test context."""
+ super(PermissionsTestCase, self).setUp()
+ self.values = {
+ "username": self.user.username, "role": "DomainAdmins",
+ "is_active": self.user.is_active, "email": "user@test.com",
+ "quota_act": True
+ }
def tearDown(self):
self.client.logout()
diff --git a/modoboa/admin/tests/test_api.py b/modoboa/admin/tests/test_api.py
index c6d09f489..a56eb0161 100644
--- a/modoboa/admin/tests/test_api.py
+++ b/modoboa/admin/tests/test_api.py
@@ -43,18 +43,20 @@ class DomainAPITestCase(ModoAPITestCase):
def test_create_domain(self):
"""Check domain creation."""
url = reverse("external_api:domain-list")
- response = self.client.post(url, {"name": "test3.com", "quota": 10})
+ response = self.client.post(
+ url, {"name": "test3.com", "quota": 0, "default_mailbox_quota": 10}
+ )
self.assertEqual(response.status_code, 201)
self.assertTrue(
models.Domain.objects.filter(name="test3.com").exists())
response = self.client.post(url, {})
self.assertEqual(response.status_code, 400)
self.assertIn("name", response.data)
- self.assertIn("quota", response.data)
self.client.credentials(
HTTP_AUTHORIZATION='Token ' + self.da_token.key)
- response = self.client.post(url, {"name": "test4.com", "quota": 10})
+ response = self.client.post(
+ url, {"name": "test4.com", "default_mailbox_quota": 10})
self.assertEqual(response.status_code, 403)
def test_update_domain(self):
@@ -64,15 +66,17 @@ class DomainAPITestCase(ModoAPITestCase):
domain__name="test.com", address="user").update(
use_domain_quota=True)
url = reverse("external_api:domain-detail", args=[domain.pk])
- response = self.client.put(url, {"name": "test.com", "quota": 1000})
+ response = self.client.put(
+ url, {"name": "test.com", "default_mailbox_quota": 1000})
self.assertEqual(response.status_code, 200)
domain.refresh_from_db()
- self.assertEqual(domain.quota, 1000)
+ self.assertEqual(domain.default_mailbox_quota, 1000)
mb = models.Mailbox.objects.get(
domain__name="test.com", address="user")
self.assertEqual(mb.quota, 1000)
- response = self.client.put(url, {"name": "test42.com", "quota": 1000})
+ response = self.client.put(
+ url, {"name": "test42.com", "default_mailbox_quota": 1000})
self.assertEqual(response.status_code, 200)
self.assertTrue(
models.Mailbox.objects.filter(
@@ -267,7 +271,8 @@ class AccountAPITestCase(ModoAPITestCase):
user = core_models.User.objects.filter(pk=account["pk"]).first()
self.assertIsNot(user, None)
self.assertIsNot(user.mailbox, None)
- self.assertEqual(user.mailbox.quota, user.mailbox.domain.quota)
+ self.assertEqual(
+ user.mailbox.quota, user.mailbox.domain.default_mailbox_quota)
def test_create_existing_account(self):
"""Check if unicity is respected."""
@@ -297,7 +302,7 @@ class AccountAPITestCase(ModoAPITestCase):
self.client.credentials(
HTTP_AUTHORIZATION='Token ' + self.da_token.key)
data = copy.deepcopy(self.ACCOUNT_DATA)
- data["mailbox"]["quota"] = 20
+ data["mailbox"]["quota"] = 1000
url = reverse("external_api:account-list")
response = self.client.post(url, data, format="json")
self.assertEqual(response.status_code, 400)
diff --git a/modoboa/admin/tests/test_domain.py b/modoboa/admin/tests/test_domain.py
index 4c7aef499..859d985d6 100644
--- a/modoboa/admin/tests/test_domain.py
+++ b/modoboa/admin/tests/test_domain.py
@@ -25,35 +25,37 @@ class DomainTestCase(ModoTestCase):
def test_create(self):
"""Test the creation of a domain."""
values = {
- "name": "pouet.com", "quota": 100, "create_dom_admin": False,
- "type": "domain", "stepid": "step3"
+ "name": "pouet.com", "quota": 1000, "default_mailbox_quota": 100,
+ "create_dom_admin": False, "type": "domain", "stepid": "step3"
}
self.ajax_post(reverse("admin:domain_add"), values)
dom = Domain.objects.get(name="pouet.com")
self.assertEqual(dom.name, "pouet.com")
- self.assertEqual(dom.quota, 100)
+ self.assertEqual(dom.quota, 1000)
+ self.assertEqual(dom.default_mailbox_quota, 100)
self.assertEqual(dom.enabled, False)
self.assertFalse(dom.admins)
def test_create_utf8(self):
"""Test the creation of a domain with non-ASCII characters."""
values = {
- "name": "pouét.com", "quota": 100, "create_dom_admin": False,
- "type": "domain", "stepid": "step3"
+ "name": "pouét.com", "quota": 1000, "default_mailbox_quota": 100,
+ "create_dom_admin": False, "type": "domain", "stepid": "step3"
}
self.ajax_post(reverse("admin:domain_add"), values)
dom = Domain.objects.get(name=u"pouét.com")
self.assertEqual(dom.name, u"pouét.com")
- self.assertEqual(dom.quota, 100)
+ self.assertEqual(dom.quota, 1000)
+ self.assertEqual(dom.default_mailbox_quota, 100)
self.assertEqual(dom.enabled, False)
self.assertFalse(dom.admins)
def test_create_with_template(self):
"""Test the creation of a domain with a template."""
values = {
- "name": "pouet.com", "quota": 100, "create_dom_admin": True,
- "dom_admin_username": "toto", "create_aliases": True,
- "type": "domain", "stepid": 'step3'
+ "name": "pouet.com", "quota": 1000, "default_mailbox_quota": 100,
+ "create_dom_admin": True, "dom_admin_username": "toto",
+ "create_aliases": True, "type": "domain", "stepid": 'step3'
}
self.ajax_post(reverse("admin:domain_add"), values)
dom = Domain.objects.get(name="pouet.com")
@@ -67,9 +69,9 @@ class DomainTestCase(ModoTestCase):
self.assertTrue(da.can_access(al))
values = {
- "name": "pouet2.com", "quota": 100, "create_dom_admin": True,
- "dom_admin_username": "postmaster", "create_aliases": True,
- "type": "domain", "stepid": "step3"
+ "name": "pouet2.com", "quota": 1000, "default_mailbox_quota": 100,
+ "create_dom_admin": True, "dom_admin_username": "postmaster",
+ "create_aliases": True, "type": "domain", "stepid": "step3"
}
self.ajax_post(reverse("admin:domain_add"), values)
self.assertTrue(
@@ -81,9 +83,9 @@ class DomainTestCase(ModoTestCase):
def test_create_with_template_and_empty_quota(self):
"""Test the creation of a domain with a template and no quota"""
values = {
- "name": "pouet.com", "quota": 0, "create_dom_admin": True,
- "dom_admin_username": "toto", "create_aliases": True,
- "type": "domain", "stepid": 'step3'
+ "name": "pouet.com", "quota": 0, "default_mailbox_quota": 0,
+ "create_dom_admin": True, "dom_admin_username": "toto",
+ "create_aliases": True, "type": "domain", "stepid": 'step3'
}
self.ajax_post(
reverse("admin:domain_add"),
@@ -104,9 +106,9 @@ class DomainTestCase(ModoTestCase):
password = "Toto1000"
self.set_global_parameter("default_password", password, app="core")
values = {
- "name": "pouet.com", "quota": 0, "create_dom_admin": True,
- "dom_admin_username": "toto", "create_aliases": True,
- "type": "domain", "stepid": 'step3'
+ "name": "pouet.com", "quota": 0, "default_mailbox_quota": 0,
+ "create_dom_admin": True, "dom_admin_username": "toto",
+ "create_aliases": True, "type": "domain", "stepid": 'step3'
}
self.ajax_post(
reverse("admin:domain_add"),
@@ -125,20 +127,12 @@ class DomainTestCase(ModoTestCase):
self.client.login(username="toto@pouet.com", password=password))
def test_create_using_default_quota(self):
- self.set_global_parameter("default_domain_quota", 50)
- values = {
- "name": "pouet.com", "create_dom_admin": True,
- "dom_admin_username": "toto", "create_aliases": True,
- "type": "domain", "stepid": 'step3'
- }
- self.ajax_post(
- reverse("admin:domain_add"),
- values
- )
- dom = Domain.objects.get(name="pouet.com")
- self.assertEqual(dom.quota, 50)
- da = User.objects.get(username="toto@pouet.com")
- self.assertEqual(da.mailbox.quota, 50)
+ """Check that default value is used for creation."""
+ self.set_global_parameter("default_domain_quota", 500)
+ self.set_global_parameter("default_mailbox_quota", 50)
+ response = self.client.get(reverse("admin:domain_add"))
+ self.assertContains(response, "value=\"500\"")
+ self.assertContains(response, "value=\"50\"")
def test_modify(self):
"""Test the modification of a domain
@@ -146,8 +140,8 @@ class DomainTestCase(ModoTestCase):
Rename 'test.com' domain to 'pouet.com'
"""
values = {
- "name": "pouet.com", "quota": 100, "type": "domain",
- "enabled": True
+ "name": "pouet.com", "quota": 1000, "default_mailbox_quota": 100,
+ "type": "domain", "enabled": True
}
dom = Domain.objects.get(name="test.com")
self.ajax_post(
diff --git a/modoboa/admin/tests/test_domain_alias.py b/modoboa/admin/tests/test_domain_alias.py
index 3a665b3e4..f5f21efcc 100644
--- a/modoboa/admin/tests/test_domain_alias.py
+++ b/modoboa/admin/tests/test_domain_alias.py
@@ -38,11 +38,12 @@ class DomainAliasTestCase(ModoTestCase):
def test_form(self):
dom = Domain.objects.get(name="test.com")
- values = dict(
- name=dom.name, quota=dom.quota, enabled=dom.enabled,
- aliases="domalias.net", aliases_1="domaliasé.com",
- type="domain"
- )
+ values = {
+ "name": dom.name, "quota": dom.quota,
+ "default_mailbox_quota": dom.default_mailbox_quota,
+ "enabled": dom.enabled, "aliases": "domalias.net",
+ "aliases_1": "domaliasé.com", "type": "domain"
+ }
self.ajax_post(
reverse("admin:domain_change",
args=[dom.id]),
diff --git a/modoboa/admin/tests/test_export.py b/modoboa/admin/tests/test_export.py
index 639ae767a..f35eb8a9f 100644
--- a/modoboa/admin/tests/test_export.py
+++ b/modoboa/admin/tests/test_export.py
@@ -5,10 +5,10 @@ from django.core.urlresolvers import reverse
from modoboa.lib.tests import ModoTestCase
from .. import factories
+from .. import models
class ExportTestCase(ModoTestCase):
-
"""Test case for export operations."""
@classmethod
@@ -17,6 +17,14 @@ class ExportTestCase(ModoTestCase):
super(ExportTestCase, cls).setUpTestData()
factories.populate_database()
+ def __export_domains(self, domfilter=""):
+ self.client.get(
+ "{}?domfilter={}".format(
+ reverse("admin:_domain_list"), domfilter))
+ return self.client.post(
+ reverse("admin:domain_export"), {"filename": "test.csv"}
+ )
+
def __export_identities(self, idtfilter="", grpfilter=""):
self.client.get(
reverse("admin:_identity_list") +
@@ -28,12 +36,29 @@ class ExportTestCase(ModoTestCase):
)
def assertListEqual(self, list1, list2):
- list2 = list2.split('\r\n')
- for entry in list1.split('\r\n'):
+ list1 = list1.split("\r\n")
+ list2 = list2.split("\r\n")
+ self.assertEqual(len(list1), len(list2))
+ for entry in list1:
if not entry:
continue
self.assertIn(entry, list2)
+ def test_export_domains(self):
+ """Check domain export."""
+ dom = models.Domain.objects.get(name="test.com")
+ factories.DomainAliasFactory(name="alias.test", target=dom)
+ response = self.__export_domains()
+ expected_response = [
+ "domain;test.com;50;10;True",
+ "domainalias;alias.test;test.com;True",
+ "domain;test2.com;0;0;True",
+ ]
+ self.assertListEqual(
+ "\r\n".join(expected_response),
+ response.content.strip()
+ )
+
def test_export_identities(self):
response = self.__export_identities()
self.assertListEqual(
diff --git a/modoboa/admin/tests/test_import_.py b/modoboa/admin/tests/test_import_.py
index 24b50733d..067c50cab 100644
--- a/modoboa/admin/tests/test_import_.py
+++ b/modoboa/admin/tests/test_import_.py
@@ -25,8 +25,8 @@ class ImportTestCase(ModoTestCase):
self.assertEqual(response.status_code, 200)
self.assertIn("Provide a CSV", response.content)
- f = ContentFile(b"""domain; domain1.com; 100; True
-domain; domain2.com; 200; False
+ f = ContentFile(b"""domain; domain1.com; 1000; 100; True
+domain; domain2.com; 1000; 200; False
domainalias; domalias1.com; domain1.com; True
""", name="domains.csv")
self.client.post(
@@ -36,7 +36,8 @@ domainalias; domalias1.com; domain1.com; True
)
admin = User.objects.get(username="admin")
dom = Domain.objects.get(name="domain1.com")
- self.assertEqual(dom.quota, 100)
+ self.assertEqual(dom.quota, 1000)
+ self.assertEqual(dom.default_mailbox_quota, 100)
self.assertTrue(dom.enabled)
self.assertTrue(admin.is_owner(dom))
domalias = DomainAlias.objects.get(name="domalias1.com")
@@ -44,12 +45,28 @@ domainalias; domalias1.com; domain1.com; True
self.assertTrue(dom.enabled)
self.assertTrue(admin.is_owner(domalias))
dom = Domain.objects.get(name="domain2.com")
- self.assertEqual(dom.quota, 200)
+ self.assertEqual(dom.default_mailbox_quota, 200)
self.assertFalse(dom.enabled)
self.assertTrue(admin.is_owner(dom))
+ def test_domain_import_bad_syntax(self):
+ """Check errors handling."""
+ url = reverse("admin:domain_import")
+ f = ContentFile("domain; domain1.com; 100; True",
+ name="domains.csv")
+ response = self.client.post(url, {"sourcefile": f})
+ self.assertContains(response, "Invalid line")
+ f = ContentFile("domain; domain1.com; XX; 100; True",
+ name="domains.csv")
+ response = self.client.post(url, {"sourcefile": f})
+ self.assertContains(response, "Invalid quota value")
+ f = ContentFile("domain; domain1.com; 100; XX; True",
+ name="domains.csv")
+ response = self.client.post(url, {"sourcefile": f})
+ self.assertContains(response, "Invalid default mailbox quota")
+
def test_import_domains_with_conflict(self):
- f = ContentFile(b"""domain;test.alias;10;True
+ f = ContentFile(b"""domain;test.alias;100;10;True
domainalias;test.alias;test.com;True
""", name="domains.csv")
resp = self.client.post(
@@ -160,7 +177,7 @@ account; user1@test.com; toto; User; One; True; SimpleUsers; user1@test.com; ; t
self.client.logout()
self.client.login(username="admin@test.com", password="toto")
f = ContentFile(b"""
-domain; domain2.com; 200; False
+domain; domain2.com; 1000; 200; False
""", name="identities.csv")
resp = self.client.post(
reverse("admin:identity_import"),
@@ -181,13 +198,13 @@ domainalias; domalias1.com; test.com; True
self.client.logout()
self.client.login(username="admin@test.com", password="toto")
f = ContentFile(b"""
-account; user1@test.com; toto; User; One; True; SimpleUsers; user1@test.com; 20
+account; user1@test.com; toto; User; One; True; SimpleUsers; user1@test.com; 40
""", name="identities.csv")
resp = self.client.post(
reverse("admin:identity_import"),
{"sourcefile": f, "crypt_password": True}
)
- self.assertIn('Quota is greater than the allowed', resp.content)
+ self.assertIn("Domain quota exceeded", resp.content)
def test_import_missing_quota(self):
f = ContentFile(b"""
@@ -200,7 +217,7 @@ account; user1@test.com; toto; User; One; True; SimpleUsers; user1@test.com
account = User.objects.get(username="user1@test.com")
self.assertEqual(
account.mailbox.quota,
- account.mailbox.domain.quota
+ account.mailbox.domain.default_mailbox_quota
)
def test_import_duplicate(self):
diff --git a/modoboa/core/migrations/0012_auto_20170215_1034.py b/modoboa/core/migrations/0012_auto_20170215_1034.py
new file mode 100644
index 000000000..51e0fd7d3
--- /dev/null
+++ b/modoboa/core/migrations/0012_auto_20170215_1034.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-15 09:34
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def rename_settings(apps, schema_editor):
+ """Rename settings."""
+ LocalConfig = apps.get_model("core", "LocalConfig")
+ lc = LocalConfig.objects.first()
+ condition = (
+ lc and
+ "admin" in lc._parameters and
+ "default_domain_quota" in lc._parameters["admin"]
+ )
+ if condition:
+ lc._parameters["admin"]["default_mailbox_quota"] = (
+ lc._parameters["admin"]["default_domain_quota"])
+ del lc._parameters["admin"]["default_domain_quota"]
+ lc.save(update_fields=["_parameters"])
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0011_auto_20161104_2217'),
+ ]
+
+ operations = [
+ migrations.RunPython(rename_settings)
+ ]
diff --git a/modoboa/core/tests/test_views.py b/modoboa/core/tests/test_views.py
index 4f304d1b8..46f333830 100644
--- a/modoboa/core/tests/test_views.py
+++ b/modoboa/core/tests/test_views.py
@@ -115,6 +115,7 @@ class SettingsTestCase(ModoTestCase):
"admin-auto_create_domain_and_mailbox": "True",
"admin-enable_dnsbl_checks": "True",
"admin-default_domain_quota": "0",
+ "admin-default_mailbox_quota": "0",
"core-ldap_server_address": "localhost",
"core-authentication_type": "local",
"core-ldap_admin_groups": "",
diff --git a/modoboa/lib/form_utils.py b/modoboa/lib/form_utils.py
index d8914c4d4..f04c6f5fc 100644
--- a/modoboa/lib/form_utils.py
+++ b/modoboa/lib/form_utils.py
@@ -21,7 +21,6 @@ from modoboa.lib.web_utils import render_to_json_response
class WizardStep(object):
-
"""A wizard step."""
def __init__(self, uid, formclass, title, formtpl=None, new_args=None):
@@ -66,7 +65,6 @@ class WizardStep(object):
class WizardForm(object):
-
"""Custom wizard."""
__metaclass__ = abc.ABCMeta
diff --git a/modoboa/limits/tests/test_domain_limits.py b/modoboa/limits/tests/test_domain_limits.py
index bf70ac4c9..dede7d468 100644
--- a/modoboa/limits/tests/test_domain_limits.py
+++ b/modoboa/limits/tests/test_domain_limits.py
@@ -34,6 +34,7 @@ class DomainLimitsTestCase(lib_tests.ModoTestCase):
domain = Domain.objects.get(name="test.com")
values = {
"name": domain.name, "quota": domain.quota,
+ "default_mailbox_quota": domain.default_mailbox_quota,
"enabled": domain.enabled, "type": "domain",
"mailboxes_limit": 3, "mailbox_aliases_limit": 3,
"domain_aliases_limit": 3, "domain_admins_limit": 3
@@ -62,6 +63,7 @@ class DomainLimitsTestCase(lib_tests.ModoTestCase):
self.assertFalse(limit.is_exceeded())
values = {
"name": domain.name, "quota": domain.quota,
+ "default_mailbox_quota": domain.default_mailbox_quota,
"enabled": domain.enabled, "type": "domain",
"mailboxes_limit": 2, "mailbox_aliases_limit": 2,
"domain_aliases_limit": 2, "domain_admins_limit": 2,
diff --git a/modoboa/limits/tests/test_import.py b/modoboa/limits/tests/test_import.py
index dc222f426..c3ca812b3 100644
--- a/modoboa/limits/tests/test_import.py
+++ b/modoboa/limits/tests/test_import.py
@@ -147,8 +147,8 @@ class UserLimitImportTestCase(LimitImportTestCase):
username=self.reseller.username, password="toto")
limit = self.reseller.userobjectlimit_set.get(name="domains")
self.assertFalse(limit.is_exceeded())
- f = ContentFile(b"""domain; domain1.com; 100; True
-domain; domain2.com; 200; False
+ f = ContentFile(b"""domain; domain1.com; 1000; 100; True
+domain; domain2.com; 1000; 200; False
""", name="domains.csv")
self.client.post(
reverse("admin:domain_import"), {
@@ -157,7 +157,7 @@ domain; domain2.com; 200; False
)
self.assertTrue(limit.is_exceeded())
- f = ContentFile(b"""domain; domain3.com; 100; True
+ f = ContentFile(b"""domain; domain3.com; 1000; 100; True
""", name="domains.csv")
response = self.client.post(
reverse("admin:domain_import"), {
diff --git a/modoboa/limits/tests/test_user_limits.py b/modoboa/limits/tests/test_user_limits.py
index 78c2b109b..8a2f72c46 100644
--- a/modoboa/limits/tests/test_user_limits.py
+++ b/modoboa/limits/tests/test_user_limits.py
@@ -78,7 +78,8 @@ class ResourceTestCase(lib_tests.ModoTestCase):
def _create_domain(self, name, status=200, withtpl=False):
values = {
- "name": name, "quota": 100, "create_dom_admin": False,
+ "name": name, "quota": 100, "default_mailbox_quota": 10,
+ "create_dom_admin": False,
"create_aliases": False, "stepid": "step3", "type": "domain"
}
if withtpl:
@@ -95,16 +96,17 @@ class ResourceTestCase(lib_tests.ModoTestCase):
def _domain_alias_operation(self, optype, domain, name, status=200):
dom = Domain.objects.get(name=domain)
values = {
- 'name': dom.name, 'quota': dom.quota, 'enabled': dom.enabled,
- "type": "domain"
+ "name": dom.name, "quota": dom.quota, "enabled": dom.enabled,
+ "type": "domain",
+ "default_mailbox_quota": dom.default_mailbox_quota,
}
aliases = [alias.name for alias in dom.domainalias_set.all()]
- if optype == 'add':
+ if optype == "add":
aliases.append(name)
else:
aliases.remove(name)
for cpt, alias in enumerate(aliases):
- fname = 'aliases' if not cpt else 'aliases_%d' % cpt
+ fname = "aliases" if not cpt else "aliases_%d" % cpt
values[fname] = alias
self.ajax_post(
reverse("admin:domain_change", args=[dom.id]),
diff --git a/modoboa/relaydomains/migrations/0006_auto_20170215_0948.py b/modoboa/relaydomains/migrations/0006_auto_20170215_0948.py
new file mode 100644
index 000000000..6f0ed989d
--- /dev/null
+++ b/modoboa/relaydomains/migrations/0006_auto_20170215_0948.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-15 08:48
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('relaydomains', '0005_auto_20161105_1426'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='relaydomain',
+ name='last_modification',
+ field=models.DateTimeField(auto_now=True, default=django.utils.timezone.now),
+ preserve_default=False,
+ ),
+ ]
diff --git a/modoboa/relaydomains/tests.py b/modoboa/relaydomains/tests.py
index 443d1523e..b76606928 100644
--- a/modoboa/relaydomains/tests.py
+++ b/modoboa/relaydomains/tests.py
@@ -23,7 +23,8 @@ class Operations(object):
values = {
"name": name, "create_dom_admin": False, "type": "relaydomain",
"target_host": "external.host.tld", "target_port": 25,
- "service": srv.id, "enabled": True, "stepid": "step3"
+ "service": srv.id, "enabled": True, "stepid": "step3",
+ "quota": 0, "default_mailbox_quota": 0
}
return self.ajax_post(
reverse("admin:domain_add"),
@@ -35,7 +36,8 @@ class Operations(object):
values = {
"name": rdom.domain.name, "target_host": rdom.target_host,
"target_port": rdom.target_port,
- "type": "relaydomain", "service": rdom.service.id
+ "type": "relaydomain", "service": rdom.service.id,
+ "quota": 0, "default_mailbox_quota": 0
}
aliases = [alias.name for alias in rdom.domain.domainalias_set.all()]
if optype == 'add':
@@ -144,7 +146,8 @@ class RelayDomainsTestCase(ModoTestCase, Operations):
values = {
"name": "relaydomain.org", "target_host": self.rdom.target_host,
"target_port": 4040, "type": "relaydomain", "enabled": True,
- "service": self.rdom.service.id
+ "service": self.rdom.service.id,
+ "quota": 0, "default_mailbox_quota": 0
}
self.ajax_post(
reverse("admin:domain_change", args=[self.rdom.domain.id]),
@@ -159,6 +162,8 @@ class RelayDomainsTestCase(ModoTestCase, Operations):
values = {
"name": "relaydomain.tld",
"type": "domain",
+ "quota": 0,
+ "default_mailbox_quota": 0,
"enabled": True,
"target_host": self.rdom.target_host,
"target_port": self.rdom.target_port,
@@ -176,6 +181,8 @@ class RelayDomainsTestCase(ModoTestCase, Operations):
"name": "relaydomain.tld",
"type": "relaydomain",
"enabled": True,
+ "quota": 0,
+ "default_mailbox_quota": 0
}
self.ajax_post(
reverse("admin:domain_change", args=[domain_pk]), values)
@@ -195,7 +202,8 @@ class RelayDomainsTestCase(ModoTestCase, Operations):
"name": "relaydomain.org", "target_host": self.rdom.target_host,
"target_port": self.rdom.target_port,
"type": "relaydomain", "service": self.rdom.service.id,
- "aliases": "relaydomainalias.net"
+ "aliases": "relaydomainalias.net",
+ "quota": 0, "default_mailbox_quota": 0
}
self.ajax_post(
reverse('admin:domain_change',