From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <h.laimer@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 63D0B84932
for <pbs-devel@lists.proxmox.com>; Tue, 14 Dec 2021 13:44:54 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 5D08324DE9
for <pbs-devel@lists.proxmox.com>; Tue, 14 Dec 2021 13:44:24 +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 id 6556024DD6
for <pbs-devel@lists.proxmox.com>; Tue, 14 Dec 2021 13:44:23 +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 3F2CD45003
for <pbs-devel@lists.proxmox.com>; Tue, 14 Dec 2021 13:44:23 +0100 (CET)
From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Tue, 14 Dec 2021 13:44:08 +0100
Message-Id: <20211214124408.17003-5-h.laimer@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20211214124408.17003-1-h.laimer@proxmox.com>
References: <20211214124408.17003-1-h.laimer@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.063 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
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: [pbs-devel] [PATCH proxmox-backup 4/4] ui: add new options tab
under configuration
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 14 Dec 2021 12:44:54 -0000
... and add email-from + move http-proxy there
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
www/SystemConfiguration.js | 25 +++++++++++++++++++++++--
www/config/NodeOptionView.js | 9 +++++++++
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/www/SystemConfiguration.js b/www/SystemConfiguration.js
index 86371193..ac24bff9 100644
--- a/www/SystemConfiguration.js
+++ b/www/SystemConfiguration.js
@@ -63,9 +63,25 @@ Ext.define('PBS.SystemConfiguration', {
title: gettext('Webauthn'),
xtype: 'pbsWebauthnConfigView',
},
+ ],
+ },
+ {
+ title: gettext('Options'),
+ itemId: 'options',
+ xtype: 'panel',
+ layout: {
+ type: 'vbox',
+ align: 'stretch',
+ multi: true,
+ },
+ defaults: {
+ collapsible: true,
+ animCollapse: false,
+ margin: '10 10 0 10',
+ },
+ items: [
{
- // FIXME: this is only a semi-OK place as long as there's only the http-proxy in there
- title: gettext('HTTP proxy'),
+ title: gettext('General'),
xtype: 'pbsNodeOptionView',
},
],
@@ -86,6 +102,11 @@ Ext.define('PBS.SystemConfiguration', {
Ext.Array.forEach(authentication.query(), function(item) {
item.relayEvents(authentication, ['activate', 'deactivate', 'destroy']);
});
+
+ let options = me.getComponent('options');
+ Ext.Array.forEach(options.query(), function(item) {
+ item.relayEvents(options, ['activate', 'deactivate', 'destroy']);
+ });
},
});
diff --git a/www/config/NodeOptionView.js b/www/config/NodeOptionView.js
index 55271a91..64f3d792 100644
--- a/www/config/NodeOptionView.js
+++ b/www/config/NodeOptionView.js
@@ -34,6 +34,15 @@ Ext.define('PBS.NodeOptionView', {
deleteEmpty: true,
onlineHelp: 'node_options_http_proxy',
},
+ {
+ xtype: 'text',
+ name: 'email-from',
+ defaultValue: gettext('root@$hostname'),
+ text: gettext('Email from address'),
+ vtype: 'proxmoxMail',
+ deleteEmpty: true,
+ },
+
],
initComponent: function() {
--
2.30.2