From 89ee70cf35c6075bb5b3044474b10955f0c082d5 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 18 Sep 2012 21:14:41 +0200 Subject: [PATCH] Seems like I was wrong :p see #298 --- modoboa/extensions/amavis/sql_listing.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modoboa/extensions/amavis/sql_listing.py b/modoboa/extensions/amavis/sql_listing.py index 14447ef11..dbecc7ec3 100644 --- a/modoboa/extensions/amavis/sql_listing.py +++ b/modoboa/extensions/amavis/sql_listing.py @@ -134,18 +134,18 @@ class PgWrapper(SQLWrapper): else: q = ~Q(rs='D') if request.user.group == 'SimpleUsers': - msgs = Msgrcpt.objects.filter(q).extra( + return Msgrcpt.objects.filter(q).extra( where=["convert_from(maddr.email, 'UTF8') = '%s'" % request.user.email], tables=['maddr'] ) - else: - where = [] - if not request.user.is_superuser: - doms = request.user.get_domains() - regexp = "(%s)" % '|'.join(map(lambda dom: dom.name, doms)) - where.append("convert_from(maddr.email, 'UTF8') ~ '%s'" % regexp) - if rcptfilter is not None: - where.append("convert_from(maddr.email, 'UTF8') LIKE '%%%s%%'" % rcptfilter) + + where = [] + if not request.user.is_superuser: + doms = request.user.get_domains() + regexp = "(%s)" % '|'.join(map(lambda dom: dom.name, doms)) + where.append("convert_from(maddr.email, 'UTF8') ~ '%s'" % regexp) + if rcptfilter is not None: + where.append("convert_from(maddr.email, 'UTF8') LIKE '%%%s%%'" % rcptfilter) return Msgrcpt.objects.filter(q).extra(where=where, tables=['maddr']).values("mail_id") def get_recipient_message(self, address, mailid):