fix #3287: add recipient filter for virus & attachment quarantines

So that users can filter these quarantine views, e.g. useful if they
have many mails there.

Replaced the emailSelection config with a quarantineType configs
since we want to have different behaviour for different quaratine
types. E.g., we want to show 'all' mails by default for the
virus/attachment quarantine, but not for the spam one.

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

diff --git a/js/AttachmentQuarantine.js b/js/AttachmentQuarantine.js
index 09406e7bda3c830ad81265da2b7e8bb805808100..4e9bb80ab40e3bc6734baf4677ec598a9e69ce95 100644 (file)
--- a/js/AttachmentQuarantine.js
+++ b/js/AttachmentQuarantine.js
@@ -43,7 +43,7 @@ Ext.define('PMG.AttachmentQuarantine', {
            xtype: 'pmgQuarantineList',
            emptyText: gettext('No data in database'),
            selModel: 'checkboxmodel',
-           emailSelection: false,
+           quarantineType: 'attachment',
            reference: 'list',
            region: 'west',
            width: 500,

diff --git a/js/QuarantineList.js b/js/QuarantineList.js
index 74163cfb3d50ac869605ea2576cb6f7b671f8020..2da02dc190499b269f69e5651aa9768738e4f2f6 100644 (file)
--- a/js/QuarantineList.js
+++ b/js/QuarantineList.js
@@ -8,7 +8,7 @@ Ext.define('PMG.QuarantineList', {
     },
 
     config: {
-       emailSelection: false,
+       quarantineType: 'spam',
        notFoundText: gettext('No data in database'),
     },
 
@@ -24,13 +24,22 @@ Ext.define('PMG.QuarantineList', {
 
         init: function(view) {
            let me = this;
+           let emailCombobox = me.lookupReference('email');
            if (PMG.view === 'quarantineview') {
-               view.emailSelection = false;
+               view.autoLoadAll = false;
                me.setEmptyText();
+           } else {
+               emailCombobox.setVisible(true);
+               emailCombobox.setDisabled(false);
+               emailCombobox.getStore().on('load', me.injectAllOption, me);
+           }
+
+
+           if (view.quarantineType) {
+               emailCombobox.getStore().getProxy().setExtraParams({
+                   'quarantine-type': view.quarantineType,
+               });
            }
-           let emailCombobox = me.lookupReference('email');
-           emailCombobox.setVisible(view.emailSelection);
-           emailCombobox.setDisabled(!view.emailSelection);
 
            let from;
            if (PMG.QuarantineList.from !== 0) {
@@ -70,7 +79,7 @@ Ext.define('PMG.QuarantineList', {
            me.allowPositionSave = false;
            let view = me.getView();
            let store = view.getStore();
-           if (view.emailSelection) {
+           if (view.quarantineType === 'spam' && PMG.view !== 'quarantineview') {
                if (!me.lookupReference('email').getSelection()) {
                    return; // if the combobox has no selection we do not reload
                }
@@ -123,7 +132,7 @@ Ext.define('PMG.QuarantineList', {
        setUser: function(user) {
            let view = this.getView();
            let params = view.getStore().getProxy().getExtraParams();
-           if (user === null) {
+           if (!user) {
                delete params.pmail;
            } else {
                params.pmail = user;
@@ -169,10 +178,7 @@ Ext.define('PMG.QuarantineList', {
 
        resetEmail: function() {
            let me = this;
-           let view = me.getView();
-           if (view.emailSelection) {
-               me.setUser(undefined);
-           }
+           me.setUser(undefined);
        },
 
        changeEmail: function(tb, value) {
@@ -264,6 +270,18 @@ Ext.define('PMG.QuarantineList', {
            }
        },
 
+       injectAllOption: function(store, records, successfull) {
+           let me = this;
+           let view = me.getView();
+           if (successfull && records.length > 1) {
+               store.insert(0, { mail: 'all' });
+           }
+           let emailCombobox = me.lookup('email');
+           if (!emailCombobox.getSelection() && view.quarantineType !== 'spam') {
+               emailCombobox.setSelection(store.getAt(0));
+           }
+       },
+
        control: {
            '#': {
                beforedestroy: 'resetEmail',
@@ -314,6 +332,7 @@ Ext.define('PMG.QuarantineList', {
            {
                xtype: 'combobox',
                hidden: true,
+               disabled: true,
                displayField: 'mail',
                valueField: 'mail',
                listConfig: {
@@ -333,13 +352,6 @@ Ext.define('PMG.QuarantineList', {
                            renderer: Ext.htmlEncode,
                        },
                    ],
-                   listeners: {
-                       load: function(store, records, successfull) {
-                           if (successfull && records.length > 1) {
-                               store.insert(0, { mail: 'all' });
-                           }
-                       },
-                   },
                },
                queryMode: 'local',
                editable: true,

diff --git a/js/SpamQuarantine.js b/js/SpamQuarantine.js
index 7487c8f31d147169e766e588922524b55a089c91..1608f18be1c4a7bbb2e50dc3b9702ac527d9071d 100644 (file)
--- a/js/SpamQuarantine.js
+++ b/js/SpamQuarantine.js
@@ -143,7 +143,6 @@ Ext.define('PMG.SpamQuarantine', {
            title: gettext('Spam Quarantine'),
            xtype: 'pmgQuarantineList',
            selModel: 'checkboxmodel',
-           emailSelection: true,
            reference: 'list',
            region: 'west',
            width: 500,

diff --git a/js/VirusQuarantine.js b/js/VirusQuarantine.js
index ff349bac345b4eb8063df9bfaa934c7b616c43c6..65c4fda6cacc4bb435d690b66c9902a6b7b0594b 100644 (file)
--- a/js/VirusQuarantine.js
+++ b/js/VirusQuarantine.js
@@ -45,7 +45,7 @@ Ext.define('PMG.VirusQuarantine', {
            xtype: 'pmgQuarantineList',
            emptyText: gettext('No data in database'),
            selModel: 'checkboxmodel',
-           emailSelection: false,
+           quarantineType: 'virus',
            reference: 'list',
            region: 'west',
            width: 500,