From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <root@dev.dominic.proxmox.com>
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 4942C660CE
for <pve-devel@lists.proxmox.com>; Tue, 5 Jan 2021 12:00:40 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 43130276A4
for <pve-devel@lists.proxmox.com>; Tue, 5 Jan 2021 12:00:40 +0100 (CET)
Received: from dev.dominic.proxmox.com (212-186-127-178.static.upcbusiness.at
[212.186.127.178])
by firstgate.proxmox.com (Proxmox) with ESMTP id 2D89927690
for <pve-devel@lists.proxmox.com>; Tue, 5 Jan 2021 12:00:39 +0100 (CET)
Received: by dev.dominic.proxmox.com (Postfix, from userid 0)
id 0846C21347; Tue, 5 Jan 2021 12:00:39 +0100 (CET)
From: =?UTF-8?q?Dominic=20J=C3=A4ger?= <d.jaeger@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 5 Jan 2021 12:00:32 +0100
Message-Id: <20210105110033.37620-1-d.jaeger@proxmox.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 1
AWL -0.333 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
KHOP_HELO_FCRDNS 0.287 Relay HELO differs from its IP's reverse DNS
NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an SPF Record
Subject: [pve-devel] [PATCH manager 1/2] ui: firewall: Clarify group rule
subjects
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 05 Jan 2021 11:00:40 -0000
First, both buttons add a row to the grid, so they should be both "Add" (or both
"Insert").
Secondly, we add a (security group) rule to the grid, not the group itself.
Thirdly, the window title should be different to the regular rule.
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
---
www/manager6/grid/FirewallRules.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js
index 42035129..08deee2a 100644
--- a/www/manager6/grid/FirewallRules.js
+++ b/www/manager6/grid/FirewallRules.js
@@ -361,7 +361,7 @@ Ext.define('PVE.FirewallGroupRuleEdit', {
});
Ext.apply(me, {
- subject: gettext('Rule'),
+ subject: gettext('Group rule'),
isAdd: true,
items: [ ipanel ]
});
@@ -578,8 +578,7 @@ Ext.define('PVE.FirewallRules', {
if (me.allow_groups) {
me.groupBtn = Ext.create('Ext.Button', {
- text: gettext('Insert') + ': ' +
- gettext('Security Group'),
+ text: gettext('Add') + ': ' + gettext('Group rule'),
disabled: true,
handler: function() {
var win = Ext.create('PVE.FirewallGroupRuleEdit', {
--
2.20.1