doQuarantineAction: pass pmail parameter

[pmg-gui.git] / js / SpamQuarantine.js

diff --git a/js/SpamQuarantine.js b/js/SpamQuarantine.js
index 7fdacf19fe1c2690d4f472694c012113d52a63be..56c6726d5783b3c88b0c49db8fd97273f133254b 100644 (file)
--- a/js/SpamQuarantine.js
+++ b/js/SpamQuarantine.js
@@ -45,13 +45,14 @@ Ext.define('PMG.SpamQuarantine', {
 
     defaults: { border: false },
 
+    // from mail link
+    cselect: undefined,
+
     controller: {
 
        xclass: 'Ext.app.ViewController',
 
        updatePreview: function(raw, rec) {
-           var list = this.lookupReference('list');
-           var rec = list.selModel.getSelection()[0];
            var preview = this.lookupReference('preview');
 
            if (!rec || !rec.data || !rec.data.id)  {
@@ -67,8 +68,10 @@ Ext.define('PMG.SpamQuarantine', {
 
        toggleRaw: function(button) {
            var me = this;
+           var list = this.lookupReference('list');
+           var rec = list.selModel.getSelection()[0];
            me.raw = !me.raw;
-           me.updatePreview(me.raw);
+           me.updatePreview(me.raw, rec);
        },
 
        btnHandler: function(button, e) {
@@ -77,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();
            });
        },
@@ -99,6 +108,10 @@ Ext.define('PMG.SpamQuarantine', {
            grid.setVisible(!grid.isVisible());
        },
 
+       init: function(view) {
+           this.lookup('list').cselect = view.cselect;
+       },
+
        control: {
            'button[reference=raw]': {
                click: 'toggleRaw'
@@ -220,6 +233,7 @@ Ext.define('PMG.SpamQuarantine', {
                },
                {
                    xtype: 'pmgSpamInfoGrid',
+                   border: false,
                    reference: 'spaminfo'
                }
            ]