From 26c79911786917dc74459e4b7501ab8b05abc202 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 26 Jan 2013 16:03:51 +0100 Subject: [PATCH] Option added to specify the connection to use; fix #365 --- modoboa/extensions/amavis/sql_listing.py | 6 +++++- modoboa/extensions/amavis/static/amavis/js/quarantine.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modoboa/extensions/amavis/sql_listing.py b/modoboa/extensions/amavis/sql_listing.py index b2215ecb3..a04691699 100644 --- a/modoboa/extensions/amavis/sql_listing.py +++ b/modoboa/extensions/amavis/sql_listing.py @@ -132,6 +132,8 @@ class SQLWrapper(object): rq = Q(rs='p') if not user.is_superuser: doms = user.get_domains() + if not doms.count(): + return 0 regexp = "(%s)" % '|'.join(map(lambda dom: dom.name, doms)) doms_q = Q(rid__email__regex=regexp) rq &= doms_q @@ -191,6 +193,8 @@ class PgWrapper(SQLWrapper): rq = Q(rs='p') if not user.is_superuser: doms = user.get_domains() + if not doms.count(): + return 0 regexp = "(%s)" % '|'.join(map(lambda dom: dom.name, doms)) return len(Msgrcpt.objects.filter(rq).extra( where=["convert_from(maddr.email, 'UTF8') ~ '%s'" % (regexp,)], @@ -209,7 +213,7 @@ def get_wrapper(): The result depends on the DB engine in use. """ - if db_type() == 'postgres': + if db_type("amavis") == 'postgres': return PgWrapper() return SQLWrapper() diff --git a/modoboa/extensions/amavis/static/amavis/js/quarantine.js b/modoboa/extensions/amavis/static/amavis/js/quarantine.js index 5be1ecf4a..699c37252 100644 --- a/modoboa/extensions/amavis/static/amavis/js/quarantine.js +++ b/modoboa/extensions/amavis/static/amavis/js/quarantine.js @@ -57,7 +57,7 @@ Quarantine.prototype = { var $link = $(e.target).parent(); this.navobj.delparam("rcpt"); - this.navobj.from_string($link.attr("href")).update(); + this.navobj.parse_string($link.attr("href")).update(); }, view_requests: function(e) {