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 AA7B4A06B3 for ; Tue, 13 Jun 2023 14:06:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 937212F8A6 for ; Tue, 13 Jun 2023 14:06:38 +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 ; Tue, 13 Jun 2023 14:06:37 +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 8B00B44E26 for ; Tue, 13 Jun 2023 14:06:37 +0200 (CEST) From: Leo Nunner To: pve-devel@lists.proxmox.com Date: Tue, 13 Jun 2023 14:06:34 +0200 Message-Id: <20230613120634.155490-4-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230613120634.155490-1-l.nunner@proxmox.com> References: <20230613120634.155490-1-l.nunner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.097 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 - Subject: [pve-devel] [PATCH v2 manager] firewall: add scope field to IPRefSelector 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, 13 Jun 2023 12:06:38 -0000 and send the scoped value to the firewall when choosing new values. This happens for both IPSets and aliases. Signed-off-by: Leo Nunner --- www/manager6/form/IPRefSelector.js | 35 +++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/www/manager6/form/IPRefSelector.js b/www/manager6/form/IPRefSelector.js index 9ccc2fe10..b50ac1e10 100644 --- a/www/manager6/form/IPRefSelector.js +++ b/www/manager6/form/IPRefSelector.js @@ -8,7 +8,7 @@ Ext.define('PVE.form.IPRefSelector', { ref_type: undefined, // undefined = any [undefined, 'ipset' or 'alias'] - valueField: 'ref', + valueField: 'scopedref', displayField: 'ref', notFoundIsValid: true, @@ -26,7 +26,23 @@ Ext.define('PVE.form.IPRefSelector', { var store = Ext.create('Ext.data.Store', { autoLoad: true, - fields: ['type', 'name', 'ref', 'comment'], + fields: [ + 'type', + 'name', + 'ref', + 'comment', + 'scope', + { + name: 'scopedref', + calculate: function(v) { + if (v.type === 'alias') { + return `${v.scope}/${v.name}`; + } else { + return `+${v.scope}/${v.name}`; + } + }, + }, + ], idProperty: 'ref', proxy: { type: 'proxmox', @@ -65,17 +81,30 @@ Ext.define('PVE.form.IPRefSelector', { hideable: false, width: 140, }, + { + header: gettext('Scope'), + dataIndex: 'scope', + hideable: false, + width: 140, + renderer: function(value) { + return value === 'dc' ? gettext("Datacenter") : gettext("Guest"); + }, + }, { header: gettext('Comment'), dataIndex: 'comment', renderer: Ext.String.htmlEncode, + minWidth: 60, flex: 1, }, ); Ext.apply(me, { store: store, - listConfig: { columns: columns }, + listConfig: { + columns: columns, + width: 500, + }, }); me.on('change', disable_query_for_ips); -- 2.30.2