mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-11-16 09:34:03 +01:00
Refactor applications loading (wip).
This commit is contained in:
@@ -2,6 +2,8 @@
|
||||
|
||||
from django.apps import AppConfig
|
||||
|
||||
from .app_settings import load_admin_settings
|
||||
|
||||
|
||||
class AdminConfig(AppConfig):
|
||||
|
||||
@@ -11,4 +13,6 @@ class AdminConfig(AppConfig):
|
||||
verbose_name = "Modoboa admin console"
|
||||
|
||||
def ready(self):
|
||||
load_admin_settings()
|
||||
|
||||
from . import handlers
|
||||
|
||||
@@ -49,16 +49,6 @@ def extra_permissions(rolename):
|
||||
return PERMISSIONS.get(rolename, [])
|
||||
|
||||
|
||||
@events.observe("ExtraUprefsRoutes")
|
||||
def extra_routes():
|
||||
from django.conf.urls import url
|
||||
return [
|
||||
url(r'^user/forward/',
|
||||
'modoboa.admin.views.user.forward',
|
||||
name="user_forward"),
|
||||
]
|
||||
|
||||
|
||||
@events.observe("AdminMenuDisplay")
|
||||
def admin_menu(target, user):
|
||||
if target != "top_menu":
|
||||
|
||||
@@ -4,7 +4,6 @@ from optparse import make_option
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
from modoboa.core import load_core_settings
|
||||
from modoboa.core.extensions import exts_pool
|
||||
from ...models import Domain
|
||||
|
||||
@@ -20,8 +19,6 @@ class Command(BaseCommand):
|
||||
|
||||
def handle(self, *args, **kwargs):
|
||||
exts_pool.load_all()
|
||||
load_core_settings()
|
||||
|
||||
csvwriter = csv.writer(sys.stdout, delimiter=kwargs['sepchar'])
|
||||
for dom in Domain.objects.all():
|
||||
dom.to_csv(csvwriter)
|
||||
|
||||
@@ -4,7 +4,6 @@ from optparse import make_option
|
||||
|
||||
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 ...models import Alias
|
||||
@@ -21,11 +20,10 @@ class Command(BaseCommand):
|
||||
|
||||
def handle(self, *args, **kwargs):
|
||||
exts_pool.load_all()
|
||||
load_core_settings()
|
||||
|
||||
csvwriter = csv.writer(sys.stdout, delimiter=kwargs['sepchar'])
|
||||
for u in User.objects.all():
|
||||
u.to_csv(csvwriter)
|
||||
|
||||
for a in Alias.objects.prefetch_related('mboxes', 'aliases'):
|
||||
for a in Alias.objects.prefetch_related('aliasrecipient_set'):
|
||||
a.to_csv(csvwriter)
|
||||
|
||||
@@ -2,8 +2,6 @@ from optparse import make_option
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
|
||||
from modoboa.core import load_core_settings
|
||||
from modoboa.core.extensions import exts_pool
|
||||
|
||||
from ._import import import_csv
|
||||
@@ -25,7 +23,5 @@ class Command(BaseCommand):
|
||||
|
||||
def handle(self, *args, **kwargs):
|
||||
exts_pool.load_all()
|
||||
load_core_settings()
|
||||
|
||||
for filename in args:
|
||||
import_csv(filename, kwargs)
|
||||
|
||||
@@ -2,7 +2,6 @@ from optparse import make_option
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
from modoboa.core import load_core_settings
|
||||
from modoboa.core.extensions import exts_pool
|
||||
|
||||
from ._import import import_csv
|
||||
@@ -28,7 +27,5 @@ class Command(BaseCommand):
|
||||
|
||||
def handle(self, *args, **kwargs):
|
||||
exts_pool.load_all()
|
||||
load_core_settings()
|
||||
|
||||
for filename in args:
|
||||
import_csv(filename, kwargs)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
from django.core.urlresolvers import reverse
|
||||
|
||||
from modoboa.core import load_core_settings
|
||||
from modoboa.core.models import User
|
||||
from modoboa.lib.tests import ModoTestCase
|
||||
from modoboa.lib import parameters
|
||||
@@ -16,11 +15,6 @@ class PasswordSchemesTestCase(ModoTestCase):
|
||||
super(PasswordSchemesTestCase, cls).setUpTestData()
|
||||
factories.populate_database()
|
||||
|
||||
def setUp(self):
|
||||
"""Test initialization."""
|
||||
super(PasswordSchemesTestCase, self).setUp()
|
||||
load_core_settings()
|
||||
|
||||
def _create_account(self):
|
||||
values = dict(
|
||||
username="tester@test.com", first_name="Tester", last_name="Toto",
|
||||
|
||||
Reference in New Issue
Block a user