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 7CAF8C187D for ; Tue, 16 Jan 2024 15:52:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5FBED38853 for ; Tue, 16 Jan 2024 15:52:05 +0100 (CET) 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 for ; Tue, 16 Jan 2024 15:52:04 +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 8F1D749183 for ; Tue, 16 Jan 2024 15:52:04 +0100 (CET) Message-ID: Date: Tue, 16 Jan 2024 15:52:03 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20240116143022.359921-1-s.hanreich@proxmox.com> From: Mira Limbeck In-Reply-To: <20240116143022.359921-1-s.hanreich@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.218 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [v.name] Subject: Re: [pve-devel] [PATCH pve-manager v2 1/2] fix #4963: firewall: fix editing firewall rules using ips / cidrs 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, 16 Jan 2024 14:52:05 -0000 On 1/16/24 15:30, Stefan Hanreich wrote: > fall back to using v.ref as value when we do not have an alias or ipset > since scope and name are not set for ips / cidrs > > Signed-off-by: Stefan Hanreich > --- > > Changes from v1: > * Added fix for an additional bug causing changes to IPs not being > picked up by the input panel > > www/manager6/form/IPRefSelector.js | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/www/manager6/form/IPRefSelector.js b/www/manager6/form/IPRefSelector.js > index b50ac1e10..7e5eea63a 100644 > --- a/www/manager6/form/IPRefSelector.js > +++ b/www/manager6/form/IPRefSelector.js > @@ -37,8 +37,10 @@ Ext.define('PVE.form.IPRefSelector', { > calculate: function(v) { > if (v.type === 'alias') { > return `${v.scope}/${v.name}`; > - } else { > + } else if (v.type === 'ipset') { > return `+${v.scope}/${v.name}`; > + } else { > + return v.ref; > } > }, > }, lgtm, consider this: Reviewed-by: Mira Limbeck Tested-by: Mira Limbeck