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 34C996CCA5 for ; Tue, 2 Feb 2021 14:41:15 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 27E2BF579 for ; Tue, 2 Feb 2021 14:41:15 +0100 (CET) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 5E0F4F56F for ; Tue, 2 Feb 2021 14:41:14 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 267DB46116 for ; Tue, 2 Feb 2021 14:41:14 +0100 (CET) To: pve-devel@lists.proxmox.com References: <20210201142131.30024-1-a.lauterer@proxmox.com> <20210201142131.30024-8-a.lauterer@proxmox.com> <7f0b50fd-2620-226f-8341-ca21b7bdd45c@proxmox.com> From: Aaron Lauterer Message-ID: <88f63c1f-c303-85d2-e798-56cccf561e1d@proxmox.com> Date: Tue, 2 Feb 2021 14:41:13 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <7f0b50fd-2620-226f-8341-ca21b7bdd45c@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.019 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: Re: [pve-devel] [PATCH manager 7/7] ui: qemu/HardwareView: add CDROM permission check to edit button 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: Tue, 02 Feb 2021 13:41:15 -0000 On 2/2/21 2:13 PM, Dominik Csapak wrote: > well this is hardly readable anymore... (not your fault) > but, would it now not be disabled if i have no CDROM perms > even if it is a disk and i have perms for that, > because of short-circuiting ? Oh yeah, thanks for catching that. One more comment inline > > On 2/1/21 3:21 PM, Aaron Lauterer wrote: >> Add CDROM permission check to disable the Edit button if they are not >> present. >> >> Signed-off-by: Aaron Lauterer >> --- >>   www/manager6/qemu/HardwareView.js | 6 +++++- >>   1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js >> index 252a8e72..56bdc0a1 100644 >> --- a/www/manager6/qemu/HardwareView.js >> +++ b/www/manager6/qemu/HardwareView.js >> @@ -600,7 +600,11 @@ Ext.define('PVE.qemu.HardwareView', { >>           remove_btn.setText(isUsedDisk && !isCloudInit ? remove_btn.altText : remove_btn.defaultText); >>           remove_btn.RESTMethod = isUnusedDisk ? 'POST':'PUT'; >> -        edit_btn.setDisabled(rec.data.delete || !rowdef.editor || isCloudInit || (!isCDRom && !diskCap)); >> +        edit_btn.setDisabled(rec.data.delete || >> +                 !rowdef.editor || >> +                 isCloudInit || >> +                 !caps.vms['VM.Config.CDROM'] || It doesn't really help readability but should work if we additionally check if the current selection is a cdrom. This should prevent short-circuiting in that case (isCDRom && !caps.vms['VM.Config.CDROM'])) || >> +                 (!isCDRom && !diskCap)); >>           resize_btn.setDisabled(pending || !isUsedDisk || !diskCap); >> > > > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > >