doQuarantineAction: pass pmail parameter

diff --git a/js/SpamQuarantine.js b/js/SpamQuarantine.js
index cec03c169e8c30a672f3f2321c7c43cc657440f2..56c6726d5783b3c88b0c49db8fd97273f133254b 100644 (file)
--- a/js/SpamQuarantine.js
+++ b/js/SpamQuarantine.js
@@ -80,10 +80,16 @@ Ext.define('PMG.SpamQuarantine', {
            if (!selected.length) {
                return;
            }
+           var rec = selected[0];
 
            var action = button.reference;
 
-           PMG.Utils.doQuarantineAction(action, selected[0].data.id, function() {
+           var receiver = list.user;
+           if (action === 'deliver' || action === 'delete') {
+               receiver = rec.data.receiver || list.user;
+           }
+
+           PMG.Utils.doQuarantineAction(action, rec.data.id, receiver, function() {
                list.getController().load();
            });
        },

diff --git a/js/Utils.js b/js/Utils.js
index dbc3e78f77d84d0cbf4e0d7e1b1a05116d90e048..ca510c225a281e742845250b7b432bff580a3be0 100644 (file)
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -678,13 +678,15 @@ Ext.define('PMG.Utils', {
        }
     },
 
-    doQuarantineAction: function(action, id, callback) {
+    doQuarantineAction: function(action, id, pmail, callback) {
+       var params = {
+           action: action,
+           id: id
+       };
+       if (pmail !== undefined) { params.pmail = pmail; }
        Proxmox.Utils.API2Request({
            url: '/quarantine/content/',
-           params: {
-               action: action,
-               id: id
-           },
+           params: params,
            method: 'POST',
            failure: function(response, opts) {
                Ext.Msg.alert(gettext('Error'), response.htmlStatus);

diff --git a/js/VirusQuarantine.js b/js/VirusQuarantine.js
index b33568b01fef4f4a922bf0d3985cb0544473afa5..a3dead828e768fcdca548c095c2f9486df71c60b 100644 (file)
--- a/js/VirusQuarantine.js
+++ b/js/VirusQuarantine.js
@@ -63,10 +63,12 @@ Ext.define('PMG.VirusQuarantine', {
            if (!selected.length) {
                return;
            }
+           var rec = selected[0];
 
            var action = button.reference;
+           var receiver = rec.data.receiver;
 
-           PMG.Utils.doQuarantineAction(action, selected[0].data.id, function() {
+           PMG.Utils.doQuarantineAction(action, rec.data.id, receiver, function() {
                list.getController().load();
            });
        },