Quarantine: set mailinfo visible only on html preview

We did already hide it when toggling raw/html, but when choosing raw
and changing the mail, it was again set to visible.
This patch fixes that by always taking 'me.raw' into account.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/js/AttachmentQuarantine.js b/js/AttachmentQuarantine.js
index 56de22a197b61de37826de0723493c33cf3e2221..c69c6aed710bdc5d491d900642be72a2d273ca1b 100644 (file)
--- a/js/AttachmentQuarantine.js
+++ b/js/AttachmentQuarantine.js
@@ -79,7 +79,7 @@ Ext.define('PMG.AttachmentQuarantine', {
 
            me.updatePreview(me.raw || false, rec);
            me.lookup('attachmentlist').setID(rec);
-           mailinfo.setVisible(!!rec.data);
+           mailinfo.setVisible(!!rec.data && !me.raw);
            mailinfo.update(rec.data);
        },
 

diff --git a/js/SpamQuarantine.js b/js/SpamQuarantine.js
index d2c3a67d3e00b652018da338790b71c00abbbdd8..60fbae84225735b3ea54c57d5ae1b5f9f142777b 100644 (file)
--- a/js/SpamQuarantine.js
+++ b/js/SpamQuarantine.js
@@ -163,7 +163,7 @@ Ext.define('PMG.SpamQuarantine', {
            me.getViewModel().set('mailid', rec.data ? rec.data.id : '');
            me.updatePreview(me.raw || false, rec);
            me.lookupReference('spaminfo').setID(rec);
-           me.lookupReference('mailinfo').setVisible(!!rec.data);
+           me.lookupReference('mailinfo').setVisible(!!rec.data && !me.raw);
            me.lookupReference('mailinfo').update(rec.data);
        },
 

diff --git a/js/VirusQuarantine.js b/js/VirusQuarantine.js
index fb1d8366f734dd076a3756fb2c58ffa72dafcf5f..fd72396474b3d05b31b3e51ed3fd11e9a18434d1 100644 (file)
--- a/js/VirusQuarantine.js
+++ b/js/VirusQuarantine.js
@@ -82,7 +82,7 @@ Ext.define('PMG.VirusQuarantine', {
                mailinfo.setVisible(false);
                return;
            }
-           mailinfo.setVisible(true);
+           mailinfo.setVisible(!me.raw);
            mailinfo.update(selection[0].data);
        },