From 184177b405e2b4da7d9e61faba8d6c10c18e5300 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 22 May 2012 09:46:32 +0200 Subject: [PATCH] Quarantine * Mark message as viewed as soon as when a user opens one of his messages * fix: search pattern can be resetted --- extensions/amavis_quarantine/views.py | 9 ++++++--- static/js/searchbar.js | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/extensions/amavis_quarantine/views.py b/extensions/amavis_quarantine/views.py index b7c664679..3c5c0cb85 100644 --- a/extensions/amavis_quarantine/views.py +++ b/extensions/amavis_quarantine/views.py @@ -160,10 +160,13 @@ def viewmail(request, mail_id): rcpt = request.GET["rcpt"] else: rcpt = None + + if request.user.has_mailbox: mb = Mailbox.objects.get(user=request.user) - msgrcpt = Msgrcpt.objects.get(mail=mail_id, rid__email=mb.full_address) - msgrcpt.rs = 'V' - msgrcpt.save() + if not rcpt or rcpt == mb.full_address: + msgrcpt = Msgrcpt.objects.get(mail=mail_id, rid__email=mb.full_address) + msgrcpt.rs = 'V' + msgrcpt.save() content = Template(""" diff --git a/static/js/searchbar.js b/static/js/searchbar.js index 36bf020ec..b9f1860bc 100644 --- a/static/js/searchbar.js +++ b/static/js/searchbar.js @@ -39,9 +39,9 @@ criteria: criteria }); } else { - this.options.navobj.deleteParam("pattern"); - this.options.navobj.deleteParam("criteria"); - this.options.navobj.deleteParam("page"); + this.options.navobj.delparam("pattern"); + this.options.navobj.delparam("criteria"); + this.options.navobj.delparam("page"); } this.options.navobj.update(); }