From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id DF53C1FF15C for ; Fri, 27 Jun 2025 14:13:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4767913B2E; Fri, 27 Jun 2025 14:14:16 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Fri, 27 Jun 2025 14:13:38 +0200 Message-Id: <20250627121339.182283-2-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250627121339.182283-1-l.wagner@proxmox.com> References: <20250627121339.182283-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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 Subject: [pve-devel] [PATCH proxmox-widget-toolkit 2/3] notification: smtp: only show 'Unchanged' in password field when it makes sense 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The formula used for deriving the emptyText for the password field did not correctly pick up the 'isCreate' flag, so 'Unchanged' was also visible when creating a new SMTP target that has no password yet. Also took the opportunity to improve the behavior when modifying an existing target. Now the original state of the 'authentication' flag is saved. The 'Unchanged' emptyText is only shown if the loaded config contains authentication parameters. When editing a target *without* authentication, the password field does not have the 'Unchanged' emptyText any more. Signed-off-by: Lukas Wagner --- src/panel/SmtpEditPanel.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/panel/SmtpEditPanel.js b/src/panel/SmtpEditPanel.js index fd10b54..a7cfaff 100644 --- a/src/panel/SmtpEditPanel.js +++ b/src/panel/SmtpEditPanel.js @@ -8,12 +8,10 @@ Ext.define('Proxmox.panel.SmtpEditPanel', { viewModel: { xtype: 'viewmodel', - cbind: { - isCreate: '{isCreate}', - }, data: { mode: 'tls', authentication: true, + originalAuthentication: true, }, formulas: { portEmptyText: function (get) { @@ -33,8 +31,13 @@ Ext.define('Proxmox.panel.SmtpEditPanel', { return `${Proxmox.Utils.defaultText} (${port})`; }, passwordEmptyText: function (get) { - let isCreate = this.isCreate; - return get('authentication') && !isCreate ? gettext('Unchanged') : ''; + let isCreate = this.getView().isCreate; + + let auth = get('authentication'); + let origAuth = get('originalAuthentication'); + let shouldShowUnchanged = !isCreate && auth && origAuth; + + return shouldShowUnchanged ? gettext('Unchanged') : ''; }, }, }, @@ -123,7 +126,9 @@ Ext.define('Proxmox.panel.SmtpEditPanel', { inputType: 'password', fieldLabel: gettext('Password'), name: 'password', - allowBlank: true, + cbind: { + allowBlank: '{!isCreate}', + }, bind: { disabled: '{!authentication}', emptyText: '{passwordEmptyText}', @@ -206,6 +211,7 @@ Ext.define('Proxmox.panel.SmtpEditPanel', { // 'Authenticate' remains ticked (the default value) if loading an // SMTP target without authentication. me.getViewModel().set('authentication', values.authentication); + me.getViewModel().set('originalAuthentication', values.authentication); return values; }, -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel