github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-22 06:28:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Seems like I was wrong :p

Browse Source 
see #298
This commit is contained in:
Antoine Nguyen
2012-09-18 21:14:41 +02:00
parent f08e3367ff
commit 89ee70cf35
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/amavis/sql_listing.py
+9 -9
View File
@@ -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):