From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id EB6D971705 for ; Mon, 4 Oct 2021 09:50:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DBCEB17BE8 for ; Mon, 4 Oct 2021 09:50:02 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 0A8BA17BB5 for ; Mon, 4 Oct 2021 09:50:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D86C545496 for ; Mon, 4 Oct 2021 09:50:00 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 4 Oct 2021 09:50:00 +0200 Message-Id: <20211004075000.922030-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.314 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager v2] ui: resourcetree: move guest position on template creation X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Oct 2021 07:50:33 -0000 we sort templates at the end normally, but if we convert a guest to a template, it was not moved in the tree add it to the list of attributes that are checked for a move Signed-off-by: Dominik Csapak --- changes from v1: * create an array where we append the additional attributes to check instead of having the checks separate, this way, we can easily add new attributes to the list if we want to www/manager6/tree/ResourceTree.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js index 3b883d23..be90d4f7 100644 --- a/www/manager6/tree/ResourceTree.js +++ b/www/manager6/tree/ResourceTree.js @@ -239,6 +239,8 @@ Ext.define('PVE.tree.ResourceTree', { } let groups = me.viewFilter.groups || []; + // explicitly check for node/template, as those are not always grouping attributes + let moveCheckAttrs = groups.concat(['node', 'template']); let filterfn = me.viewFilter.filterfn; let reselect = false; // for disappeared nodes @@ -251,16 +253,12 @@ Ext.define('PVE.tree.ResourceTree', { let changed = false, moved = false; if (item) { // test if any grouping attributes changed, catches migrated tree-nodes in server view too - for (const attr of groups) { + for (const attr of moveCheckAttrs) { if (item.data[attr] !== olditem.data[attr]) { moved = true; break; } } - // explicitly check for node, as node is not a grouping attribute in some views - if (!moved && item.data.node !== olditem.data.node) { - moved = true; - } // tree item has been updated for (const field of ['text', 'running', 'template', 'status', 'qmpstatus', 'hastate', 'lock']) { -- 2.30.2