Some fixes.

see #155
This commit is contained in:
Antoine Nguyen
2011-08-24 15:36:03 +02:00
parent 968f91be1a
commit 230308dbd4
2 changed files with 7 additions and 2 deletions
+6 -2
View File
@@ -6,6 +6,7 @@ from django.db.models import Q
from modoboa.lib import tables, static_url
from modoboa.lib.email_listing import MBconnector, EmailListing
from modoboa.lib.emailutils import *
from modoboa.admin.lib import is_domain_admin
from models import *
class Qtable(tables.Table):
@@ -81,8 +82,11 @@ class SQLlisting(EmailListing):
reset_wm_url = True
def __init__(self, user, msgs, filter, **kwargs):
if not user.is_superuser:
Qtable.cols_order.remove('to')
if not user.is_superuser and not is_domain_admin(user):
try:
Qtable.cols_order.remove('to')
except ValueError:
pass
self.mbc = SQLconnector(msgs, filter)
super(SQLlisting, self).__init__(**kwargs)
@@ -5,6 +5,7 @@ from django.core.urlresolvers import reverse
from django.conf import settings
from modoboa.lib import static_url
from modoboa.extensions import amavis_quarantine
from modoboa.admin.lib import is_domain_admin
register = template.Library()