mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-11-16 09:34:03 +01:00
@@ -28,7 +28,7 @@ class ForwardForm(forms.Form):
|
||||
recipients = []
|
||||
rawdata = self.cleaned_data["dest"].strip()
|
||||
if not rawdata:
|
||||
return
|
||||
return recipients
|
||||
for rcpt in rawdata.split(","):
|
||||
local_part, domname = split_mailbox(rcpt)
|
||||
if not local_part or not domname:
|
||||
|
||||
@@ -6,11 +6,10 @@ from django.core.management.base import BaseCommand
|
||||
|
||||
from modoboa.core import load_core_settings
|
||||
from modoboa.core.extensions import exts_pool
|
||||
from modoboa.core.management.commands import CloseConnectionMixin
|
||||
from ...models import Domain
|
||||
|
||||
|
||||
class Command(BaseCommand, CloseConnectionMixin):
|
||||
class Command(BaseCommand):
|
||||
help = 'Export domains and domain aliases to a csv'
|
||||
|
||||
option_list = BaseCommand.option_list + (
|
||||
|
||||
@@ -7,11 +7,10 @@ from django.core.management.base import BaseCommand
|
||||
from modoboa.core import load_core_settings
|
||||
from modoboa.core.models import User
|
||||
from modoboa.core.extensions import exts_pool
|
||||
from modoboa.core.management.commands import CloseConnectionMixin
|
||||
from ...models import Alias
|
||||
|
||||
|
||||
class Command(BaseCommand, CloseConnectionMixin):
|
||||
class Command(BaseCommand):
|
||||
help = 'Export identities (mailbox and aliases) to a csv'
|
||||
|
||||
option_list = BaseCommand.option_list + (
|
||||
|
||||
@@ -5,7 +5,6 @@ import os
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
from modoboa.core.management.commands import CloseConnectionMixin
|
||||
from modoboa.lib import parameters
|
||||
from modoboa.lib.sysutils import exec_cmd
|
||||
from modoboa.lib.exceptions import InternalError
|
||||
@@ -18,7 +17,7 @@ class OperationError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class Command(BaseCommand, CloseConnectionMixin):
|
||||
class Command(BaseCommand):
|
||||
help = 'Handles rename and delete operations on mailboxes'
|
||||
|
||||
option_list = BaseCommand.option_list + (
|
||||
|
||||
@@ -5,12 +5,11 @@ from django.core.management.base import BaseCommand
|
||||
|
||||
from modoboa.core import load_core_settings
|
||||
from modoboa.core.extensions import exts_pool
|
||||
from modoboa.core.management.commands import CloseConnectionMixin
|
||||
|
||||
from ._import import import_csv
|
||||
|
||||
|
||||
class Command(BaseCommand, CloseConnectionMixin):
|
||||
class Command(BaseCommand):
|
||||
args = 'csvfile'
|
||||
help = 'Import domains and domain aliases from a csv file'
|
||||
|
||||
|
||||
@@ -4,12 +4,11 @@ from django.core.management.base import BaseCommand
|
||||
|
||||
from modoboa.core import load_core_settings
|
||||
from modoboa.core.extensions import exts_pool
|
||||
from modoboa.core.management.commands import CloseConnectionMixin
|
||||
|
||||
from ._import import import_csv
|
||||
|
||||
|
||||
class Command(BaseCommand, CloseConnectionMixin):
|
||||
class Command(BaseCommand):
|
||||
args = 'csvfile'
|
||||
help = 'Import identities from a csv file'
|
||||
|
||||
|
||||
@@ -22,8 +22,8 @@ class DomainManager(Manager):
|
||||
to fill ``ModelChoiceField`` objects.
|
||||
"""
|
||||
if admin.is_superuser:
|
||||
return self.get_query_set()
|
||||
return self.get_query_set().filter(owners__user=admin)
|
||||
return self.get_queryset()
|
||||
return self.get_queryset().filter(owners__user=admin)
|
||||
|
||||
|
||||
class Domain(AdminObject):
|
||||
|
||||
@@ -66,7 +66,7 @@ class MailboxManager(Manager):
|
||||
qf = Q(pk__in=ids) & qf
|
||||
else:
|
||||
qf = Q(pk__in=ids)
|
||||
return self.get_query_set().select_related().filter(qf)
|
||||
return self.get_queryset().select_related().filter(qf)
|
||||
|
||||
|
||||
class Mailbox(AdminObject):
|
||||
|
||||
@@ -9,8 +9,10 @@ from .. import models
|
||||
|
||||
class AccountTestCase(ModoTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(AccountTestCase, self).setUp()
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
"""Create test data."""
|
||||
super(AccountTestCase, cls).setUpTestData()
|
||||
factories.populate_database()
|
||||
|
||||
def test_crud(self):
|
||||
@@ -115,13 +117,15 @@ class AccountTestCase(ModoTestCase):
|
||||
|
||||
class PermissionsTestCase(ModoTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(PermissionsTestCase, self).setUp()
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
"""Create test data."""
|
||||
super(PermissionsTestCase, cls).setUpTestData()
|
||||
factories.populate_database()
|
||||
self.user = User.objects.get(username='user@test.com')
|
||||
self.values = dict(
|
||||
username=self.user.username, role="DomainAdmins",
|
||||
is_active=self.user.is_active, email="user@test.com",
|
||||
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
|
||||
)
|
||||
|
||||
|
||||
@@ -13,8 +13,10 @@ from ..models import Alias, AliasRecipient
|
||||
|
||||
class AliasTestCase(ModoTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(AliasTestCase, self).setUp()
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
"""Create test data."""
|
||||
super(AliasTestCase, cls).setUpTestData()
|
||||
factories.populate_database()
|
||||
|
||||
def test_alias(self):
|
||||
|
||||
@@ -16,8 +16,10 @@ class DomainTestCase(ModoTestCase):
|
||||
|
||||
"""Test case for Domain."""
|
||||
|
||||
def setUp(self):
|
||||
super(DomainTestCase, self).setUp()
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
"""Create test data."""
|
||||
super(DomainTestCase, cls).setUpTestData()
|
||||
factories.populate_database()
|
||||
|
||||
def test_create(self):
|
||||
|
||||
@@ -8,10 +8,12 @@ from ..models import Domain, DomainAlias, Alias
|
||||
|
||||
class DomainAliasTestCase(ModoTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(DomainAliasTestCase, self).setUp()
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
"""Create test data."""
|
||||
super(DomainAliasTestCase, cls).setUpTestData()
|
||||
factories.populate_database()
|
||||
self.dom = Domain.objects.get(name='test.com')
|
||||
cls.dom = Domain.objects.get(name='test.com')
|
||||
|
||||
def test_model(self):
|
||||
dom = Domain.objects.get(name="test.com")
|
||||
|
||||
@@ -11,14 +11,16 @@ class ExportTestCase(ModoTestCase):
|
||||
|
||||
"""Test case for export operations."""
|
||||
|
||||
def setUp(self):
|
||||
super(ExportTestCase, self).setUp()
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
"""Create test data."""
|
||||
super(ExportTestCase, cls).setUpTestData()
|
||||
factories.populate_database()
|
||||
|
||||
def __export_identities(self, idtfilter="", grpfilter=""):
|
||||
self.clt.get(
|
||||
reverse("admin:_identity_list")
|
||||
+ "?grpfilter=%s&idtfilter=%s" % (grpfilter, idtfilter)
|
||||
reverse("admin:_identity_list") +
|
||||
"?grpfilter=%s&idtfilter=%s" % (grpfilter, idtfilter)
|
||||
)
|
||||
return self.clt.post(
|
||||
reverse("admin:identity_export"),
|
||||
|
||||
@@ -11,8 +11,10 @@ from ..models import Domain, Alias, DomainAlias
|
||||
|
||||
class ImportTestCase(ModoTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(ImportTestCase, self).setUp()
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
"""Create test data."""
|
||||
super(ImportTestCase, cls).setUpTestData()
|
||||
factories.populate_database()
|
||||
|
||||
def test_domains_import(self):
|
||||
@@ -180,7 +182,7 @@ account; user1@test.com; toto; User; One; True; SimpleUsers; user1@test.com; 20
|
||||
f = ContentFile(b"""
|
||||
account; user1@test.com; toto; User; One; True; SimpleUsers; user1@test.com
|
||||
""", name="identities.csv")
|
||||
resp = self.clt.post(
|
||||
self.clt.post(
|
||||
reverse("admin:identity_import"),
|
||||
{"sourcefile": f, "crypt_password": True}
|
||||
)
|
||||
|
||||
@@ -9,11 +9,16 @@ from .. import factories
|
||||
|
||||
|
||||
class PasswordSchemesTestCase(ModoTestCase):
|
||||
fixtures = ['initial_users.json']
|
||||
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
"""Create test data."""
|
||||
super(PasswordSchemesTestCase, cls).setUpTestData()
|
||||
factories.populate_database()
|
||||
|
||||
def setUp(self):
|
||||
"""Test initialization."""
|
||||
super(PasswordSchemesTestCase, self).setUp()
|
||||
factories.populate_database()
|
||||
load_core_settings()
|
||||
|
||||
def _create_account(self):
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
"""SimpleUsers views."""
|
||||
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.utils.translation import ugettext as _
|
||||
@@ -38,9 +39,9 @@ def forward(request, tplname="admin/forward.html"):
|
||||
)
|
||||
|
||||
form = ForwardForm()
|
||||
if al is not None:
|
||||
if al is not None and al.recipients:
|
||||
form.fields["dest"].initial = al.recipients
|
||||
if al.aliasrecipient_set.filter(mailbox=mb.id).exists():
|
||||
if al.aliasrecipient_set.filter(r_mailbox=mb.pk).exists():
|
||||
form.fields["keepcopies"].initial = True
|
||||
return render_to_json_response({
|
||||
"content": _render_to_string(request, tplname, {
|
||||
|
||||
Reference in New Issue
Block a user