From 0b0107722f605f1ce09f76c91ee96f0c94031223 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 13 Sep 2011 17:46:57 +0200
Subject: [PATCH] There was a conflict between confirmation messages.

fixed #167
---
 .../amavis_quarantine/static/js/quarantine.js | 21 ++++++++++++++++---
 .../templatetags/amextras.py                  |  6 ++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/extensions/amavis_quarantine/static/js/quarantine.js b/extensions/amavis_quarantine/static/js/quarantine.js
index 28db0502c..8e34dd589 100644
--- a/extensions/amavis_quarantine/static/js/quarantine.js
+++ b/extensions/amavis_quarantine/static/js/quarantine.js
@@ -30,13 +30,28 @@ function actioncallback(resp) {
 }
 
 function actionclick(evt) {
-  evt.stop();
   new Request.JSON({
       url: evt.target.get("href"),
       onSuccess: actioncallback
   }).get();
 }
 
+function deleteclick(evt) {
+    evt.stop();
+    if (!confirm(gettext("Delete this message?"))) {
+        return false;
+    }
+    actionclick(evt);
+}
+
+function releaseclick(evt) {
+    evt.stop();
+    if (!confirm(gettext("Release this message?"))) {
+        return false;
+    }
+    actionclick(evt);
+}
+
 function viewmail_cs(evt) {
     evt.stop();
     var to = this.getFirst("td[name=to]");
@@ -114,8 +129,8 @@ function listing_cb(resp) {
 function viewmail_cb(resp) {
   updatelisting(resp);
   $$("a[name=back]").addEvent("click", updatehash);
-  $$("a[name=delete]").addEvent("click", actionclick);
-  $$("a[name=release]").addEvent("click", actionclick);
+  $$("a[name=delete]").addEvent("click", deleteclick);
+  $$("a[name=release]").addEvent("click", releaseclick);
   $$("a[name=viewmode]").addEvent("click", updateparams);
   setDivHeight("mailcontent", 5, 0);
 }
\ No newline at end of file
diff --git a/extensions/amavis_quarantine/templatetags/amextras.py b/extensions/amavis_quarantine/templatetags/amextras.py
index 6618d139e..27998f04e 100644
--- a/extensions/amavis_quarantine/templatetags/amextras.py
+++ b/extensions/amavis_quarantine/templatetags/amextras.py
@@ -38,14 +38,12 @@ def viewm_menu(selection, backurl, mail_id, rcpt, perms):
          "url" : reverse(amavis_quarantine.views.release, args=[mail_id]) \
              + "?rcpt=%s" % rcpt,
          "img" : static_url("pics/release.png"),
-         "label" : _("Release"),
-         "confirm" : _("Release this message?")},
+         "label" : _("Release")},
         {"name" : "delete",
          "url" : reverse(amavis_quarantine.views.delete, args=[mail_id]) \
              + "?rcpt=%s" % rcpt,
          "img" : static_url("pics/remove.png"),
-         "label" : _("Delete"),
-         "confirm" : _("Delete this message?")},
+         "label" : _("Delete")},
         {"name" : "options",
          "label" : _("Options"),
          "img" : static_url("pics/settings.png"),