diff --git a/modoboa/extensions/amavis/lib.py b/modoboa/extensions/amavis/lib.py index 811c9402c..f16cfd9b9 100644 --- a/modoboa/extensions/amavis/lib.py +++ b/modoboa/extensions/amavis/lib.py @@ -189,7 +189,10 @@ class QuarantineNavigationParameters(NavigationParameters): request, 'quarantine_navparams' ) self.parameters += [ - ('msgtype', None, False), ('viewrequests', None, False) + ('pattern', '', False), + ('criteria', 'from_addr', False), + ('msgtype', None, False), + ('viewrequests', None, False) ] def back_to_listing(self): diff --git a/modoboa/extensions/amavis/sql_connector.py b/modoboa/extensions/amavis/sql_connector.py index 2e8f4cab8..a8d8b95c4 100644 --- a/modoboa/extensions/amavis/sql_connector.py +++ b/modoboa/extensions/amavis/sql_connector.py @@ -100,7 +100,6 @@ class SQLconnector(object): criteria = "from_addr,subject,to" search_flt = None for crit in criteria.split(","): - print crit if crit == "from_addr": nfilter = Q(mail__from_addr__contains=pattern) elif crit == "subject":