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 2A8A095814 for ; Fri, 12 Apr 2024 14:21:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EE498A548 for ; Fri, 12 Apr 2024 14:21:23 +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 for ; Fri, 12 Apr 2024 14:21:23 +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 0055A4501A for ; Fri, 12 Apr 2024 14:21:23 +0200 (CEST) Date: Fri, 12 Apr 2024 14:21:19 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20240116143022.359921-1-s.hanreich@proxmox.com> In-Reply-To: <20240116143022.359921-1-s.hanreich@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1712924464.7noz2fc44w.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.057 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 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, v.name] Subject: [pve-devel] applied-series: [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: Fri, 12 Apr 2024 12:21:54 -0000 with T-B/R-B as provided, thanks! On January 16, 2024 3:30 pm, 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 >=20 > Signed-off-by: Stefan Hanreich > --- >=20 > Changes from v1: > * Added fix for an additional bug causing changes to IPs not being > picked up by the input panel >=20 > www/manager6/form/IPRefSelector.js | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) >=20 > diff --git a/www/manager6/form/IPRefSelector.js b/www/manager6/form/IPRef= Selector.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 =3D=3D=3D 'alias') { > return `${v.scope}/${v.name}`; > - } else { > + } else if (v.type =3D=3D=3D 'ipset') { > return `+${v.scope}/${v.name}`; > + } else { > + return v.ref; > } > }, > }, > --=20 > 2.39.2 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20