From 230308dbd4f7fcde0f975a38ab3e2fb3f128b612 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 24 Aug 2011 15:36:03 +0200 Subject: [PATCH] Some fixes. see #155 --- extensions/amavis_quarantine/sql_listing.py | 8 ++++++-- extensions/amavis_quarantine/templatetags/amextras.py | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/extensions/amavis_quarantine/sql_listing.py b/extensions/amavis_quarantine/sql_listing.py index 255d9bb7f..0f5572f1e 100644 --- a/extensions/amavis_quarantine/sql_listing.py +++ b/extensions/amavis_quarantine/sql_listing.py @@ -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) diff --git a/extensions/amavis_quarantine/templatetags/amextras.py b/extensions/amavis_quarantine/templatetags/amextras.py index da40bd633..56996dd76 100644 --- a/extensions/amavis_quarantine/templatetags/amextras.py +++ b/extensions/amavis_quarantine/templatetags/amextras.py @@ -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()