From 64c1d6191c9f7a6a1a36d28b9e74cdf2a7ebd13d Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Tue, 29 Mar 2022 16:04:10 +0200 Subject: [PATCH] node/Tasks: don't count 'preFilters' as normal filters they can not be removed nor are they visible, so don't count them. When having a prefilter, we now don't show anymore that there is an active filter, and don't enable the button anymore. This is the case for vms for example (vmid is a prefilter). Signed-off-by: Dominik Csapak --- src/node/Tasks.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/node/Tasks.js b/src/node/Tasks.js index 3d7113d..ef1177c 100644 --- a/src/node/Tasks.js +++ b/src/node/Tasks.js @@ -165,9 +165,11 @@ Ext.define('Proxmox.node.Tasks', { } if (get('extraFilter')) { + let preFilter = get('preFilter') || {}; let extraFilter = get('extraFilter'); - for (const value of Object.values(extraFilter)) { - if (value !== undefined && value !== null && value !== "") { + for (const [name, value] of Object.entries(extraFilter)) { + if (value !== undefined && value !== null && value !== "" && + preFilter[name] === undefined) { count++; } } @@ -458,6 +460,8 @@ Ext.define('Proxmox.node.Tasks', { updateExtraFilters(name, value); } + me.getViewModel().set('preFilter', me.preFilter); + me.callParent(); let addFields = function(items) {