public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v2 4/4][optional] ui: add new options tab under configuration
Date: Mon,  3 Jan 2022 10:04:56 +0100	[thread overview]
Message-ID: <20220103090456.17494-5-h.laimer@proxmox.com> (raw)
In-Reply-To: <20220103090456.17494-1-h.laimer@proxmox.com>

... and add from-email + move http-proxy there

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
v2: 
  Optional because I could not come up with a better structure for the ui 
  and the email can be updated through the API or the proxman-backup-manager,
  so this patch is not necessarily needed.

 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





  parent reply	other threads:[~2022-01-03  9:05 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-03  9:04 [pbs-devel] [PATCH proxmox-backup v2 0/4] close #3162: add options to configure mail_from address Hannes Laimer
2022-01-03  9:04 ` [pbs-devel] [PATCH proxmox-backup v2 1/4] config: add email-from to NodeConfig Hannes Laimer
2022-01-03  9:04 ` [pbs-devel] [PATCH proxmox-backup v2 2/4] api2: make email-from updatable Hannes Laimer
2022-01-03  9:04 ` [pbs-devel] [PATCH proxmox-backup v2 3/4] server: use configured email-from for sending mail Hannes Laimer
2022-01-03  9:04 ` Hannes Laimer [this message]
2022-01-04  7:32 ` [pbs-devel] applied: [PATCH proxmox-backup v2 0/4] close #3162: add options to configure mail_from address Dietmar Maurer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220103090456.17494-5-h.laimer@proxmox.com \
    --to=h.laimer@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal