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 01748677EC for ; Thu, 27 Aug 2020 13:17:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E72C216E5F for ; Thu, 27 Aug 2020 13:17:00 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 60CD616E56 for ; Thu, 27 Aug 2020 13:17:00 +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 19B82448CC for ; Thu, 27 Aug 2020 13:17:00 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 27 Aug 2020 13:16:55 +0200 Message-Id: <20200827111655.22957-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.053 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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] ContentView: block removal of in-use container image 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: Thu, 27 Aug 2020 11:17:01 -0000 Since commit 5dae1a319b32ea3ebbb0b48a9f0b5e3abd1833c9 in pve-storage, list_volumes correctly returns content type 'rootdir' for container images. Adapt the relevant check here to make removal behave like it does for VM images again. Signed-off-by: Fabian Ebner --- www/manager6/storage/ContentView.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js index c70c732c..194ad42e 100644 --- a/www/manager6/storage/ContentView.js +++ b/www/manager6/storage/ContentView.js @@ -432,7 +432,8 @@ Ext.define('PVE.storage.ContentView', { selModel: sm, delay: 5, enableFn: function(rec) { - if (rec && rec.data.content !== 'images') { + if (rec && rec.data.content !== 'images' && + rec.data.content !== 'rootdir') { imageRemoveButton.setVisible(false); removeButton.setVisible(true); return true; @@ -450,7 +451,8 @@ Ext.define('PVE.storage.ContentView', { hidden: true, text: gettext('Remove'), enableFn: function(rec) { - if (rec && rec.data.content === 'images') { + if (rec && (rec.data.content === 'images' || + rec.data.content === 'rootdir')) { removeButton.setVisible(false); imageRemoveButton.setVisible(true); return true; -- 2.20.1