From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <l.stechauner@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 25BF87194E
for <pve-devel@lists.proxmox.com>; Thu, 20 May 2021 15:54:32 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 141F924E76
for <pve-devel@lists.proxmox.com>; Thu, 20 May 2021 15:54:02 +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 id BB8BF24E5F
for <pve-devel@lists.proxmox.com>; Thu, 20 May 2021 15:54:00 +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 92F2D4663D
for <pve-devel@lists.proxmox.com>; Thu, 20 May 2021 15:54:00 +0200 (CEST)
From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 20 May 2021 15:53:41 +0200
Message-Id: <20210520135342.58549-2-l.stechauner@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210520135342.58549-1-l.stechauner@proxmox.com>
References: <20210520135342.58549-1-l.stechauner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.353 Adjusted score from AWL reputation of From: address
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
Subject: [pve-devel] [PATCH manager 1/1] ui: dc/UserEdit: add warning for
disabling users
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: Thu, 20 May 2021 13:54:32 -0000
see #3101
Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
---
www/manager6/dc/UserEdit.js | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/www/manager6/dc/UserEdit.js b/www/manager6/dc/UserEdit.js
index b637cd53..65a612fd 100644
--- a/www/manager6/dc/UserEdit.js
+++ b/www/manager6/dc/UserEdit.js
@@ -73,6 +73,12 @@ Ext.define('PVE.dc.UserEdit', {
uncheckedValue: 0,
defaultValue: 1,
checked: true,
+ listeners: {
+ change: function(checkbox) {
+ let taskWarning = me.lookup('taskWarning');
+ taskWarning.setHidden(!(me.wasEnabled && !checkbox.value));
+ },
+ },
},
];
@@ -93,6 +99,13 @@ Ext.define('PVE.dc.UserEdit', {
fieldLabel: gettext('E-Mail'),
vtype: 'proxmoxMail',
},
+ {
+ xtype: 'displayfield',
+ reference: 'taskWarning',
+ userCls: 'pmx-hint',
+ value: gettext('Note: Already running tasks of user will not be terminated automatically!'),
+ hidden: true,
+ },
];
if (me.isCreate) {
@@ -161,6 +174,7 @@ Ext.define('PVE.dc.UserEdit', {
success: function(response, options) {
var data = response.result.data;
me.setValues(data);
+ me.wasEnabled = data.enable;
if (data.keys) {
if (data.keys === 'x!oath' || data.keys === 'x!u2f') {
me.down('[name="keys"]').setDisabled(1);
--
2.20.1