From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <l.wagner@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 DFA459D396
for <pve-devel@lists.proxmox.com>; Thu, 23 Nov 2023 17:09:07 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id C028ED3B
for <pve-devel@lists.proxmox.com>; Thu, 23 Nov 2023 17:09:07 +0100 (CET)
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 <pve-devel@lists.proxmox.com>; Thu, 23 Nov 2023 17:09:06 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7319743449
for <pve-devel@lists.proxmox.com>; Thu, 23 Nov 2023 17:09:06 +0100 (CET)
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 23 Nov 2023 17:09:02 +0100
Message-Id: <20231123160902.282661-2-l.wagner@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20231123160902.282661-1-l.wagner@proxmox.com>
References: <20231123160902.282661-1-l.wagner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.008 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 manager 2/2] ui: one-off backup: show hint if
notification-system is used
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, 23 Nov 2023 16:09:07 -0000
When mode is 'auto' and 'mailto' is empty, show hint that the
notification system will be used.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
www/manager6/window/Backup.js | 37 +++++++++++++++++++++++++++++++----
1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js
index 4418a9c7..ce679971 100644
--- a/www/manager6/window/Backup.js
+++ b/www/manager6/window/Backup.js
@@ -30,10 +30,27 @@ Ext.define('PVE.window.Backup', {
name: 'mode',
});
+ let viewModel = new Ext.app.ViewModel({
+ formulas: {
+ showMailtoField: (get) =>
+ ['auto', 'legacy-sendmail'].includes(get('notificationMode')),
+ hintTextVisible: (get) => get('notificationMode') === 'auto' && !get('mailto'),
+ },
+ data: {
+ mailto: '',
+ notificationMode: 'auto',
+ },
+ });
+
let mailtoField = Ext.create('Ext.form.field.Text', {
fieldLabel: gettext('Send email to'),
name: 'mailto',
emptyText: Proxmox.Utils.noneText,
+ viewModel,
+ bind: {
+ value: '{mailto}',
+ hidden: '{!showMailtoField}',
+ },
});
let notificationModeSelector = Ext.create({
@@ -46,10 +63,21 @@ Ext.define('PVE.window.Backup', {
fieldLabel: gettext('Notification mode'),
name: 'notification-mode',
value: 'auto',
- listeners: {
- change: function(field, value) {
- mailtoField.setDisabled(value === 'notification-system');
- },
+ viewModel,
+ bind: {
+ value: '{notificationMode}',
+ },
+ });
+
+ let notificationSystemHint = Ext.create({
+ xtype: 'displayfield',
+ padding: '0 0 0 5',
+ userCls: 'pmx-hint',
+ hidden: true,
+ value: gettext('No email configured, the notification system will be used'),
+ viewModel,
+ bind: {
+ hidden: '{!hintTextVisible}',
},
});
@@ -198,6 +226,7 @@ Ext.define('PVE.window.Backup', {
compressionSelector,
notificationModeSelector,
mailtoField,
+ notificationSystemHint,
removeCheckbox,
],
columnB: [
--
2.39.2