* No more code inside lib/__init__.py

* Fixed a circular import raised only when using commands like 'manage.py syncdb'
This commit is contained in:
Antoine Nguyen
2011-08-25 17:22:37 +02:00
parent d1f1d4e218
commit 6f182d7850
39 changed files with 273 additions and 241 deletions
+19
View File
@@ -1,7 +1,26 @@
# coding: utf-8
from django.http import HttpResponse, HttpResponseRedirect
from django.contrib.auth.models import User, Group
from django.utils.translation import ugettext as _
from models import *
from modoboa.lib.webutils import _render_error
def is_not_localadmin(errortpl="error"):
def dec(f):
def wrapped_f(request, *args, **kwargs):
if request.user.id == 1:
return _render_error(request, errortpl, {
"error" : _("Invalid action, %(user)s is a local user" \
% {"user" : request.user.username})
})
return f(request, *args, **kwargs)
wrapped_f.__name__ = f.__name__
wrapped_f.__dict__ = f.__dict__
wrapped_f.__doc__ = f.__doc__
wrapped_f.__module__ = f.__module__
return wrapped_f
return dec
def is_domain_admin(user):
"""Tell if a user is administrator for a domain of not
+2 -1
View File
@@ -5,8 +5,9 @@ from django.utils.translation import ugettext as _
from django.dispatch import receiver
from django.conf import settings
from modoboa.lib import parameters
from modoboa.lib import exec_cmd, exec_as_vuser, crypt_password
from modoboa.lib.sysutils import exec_cmd, exec_as_vuser
from modoboa.lib.emailutils import split_mailbox
from modoboa.auth.lib import crypt_password
import os
import pwd
+1 -1
View File
@@ -3,7 +3,7 @@
import datetime
from django.utils.translation import ugettext as _
from django.contrib.auth.models import User, Group
from modoboa.lib import _render, getctx, _render_to_string
from modoboa.lib.webutils import _render, getctx, _render_to_string
from forms import *
class Permissions(object):
+2 -1
View File
@@ -3,7 +3,8 @@ from django.template.loader import render_to_string
from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse
from modoboa import admin
from modoboa.lib import events, static_url, render_actions
from modoboa.lib import events
from modoboa.lib.webutils import static_url, render_actions
register = template.Library()
+4 -3
View File
@@ -17,9 +17,10 @@ from modoboa import admin, userprefs
from models import *
from admin.permissions import *
from admin.tables import *
from modoboa.lib import crypt_password
from modoboa.lib import _render, ajax_response, ajax_simple_response, \
getctx, events, parameters
from modoboa.lib import events, parameters
from modoboa.auth.lib import crypt_password
from modoboa.lib.webutils \
import _render, ajax_response, ajax_simple_response, getctx
from modoboa.lib.emailutils import split_mailbox
from modoboa.lib.models import Parameter
import copy