From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id AF90820EC7F for ; Tue, 23 Apr 2024 13:53:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 112C33036D; Tue, 23 Apr 2024 13:53:10 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Tue, 23 Apr 2024 13:51:52 +0200 Message-Id: <20240423115230.170113-7-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240423115230.170113-1-l.wagner@proxmox.com> References: <20240423115230.170113-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 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: [pbs-devel] [PATCH widget-toolkit v5 06/44] sendmail: smtp: allow to overide default mail author X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" In PBS, we obviously don't have "Proxmox VE" as a default sender, so we need a mechanism to change the default author. Signed-off-by: Lukas Wagner Tested-by: Maximiliano Sandoval --- src/Schema.js | 9 +++++++++ src/panel/SendmailEditPanel.js | 2 +- src/panel/SmtpEditPanel.js | 2 +- src/window/EndpointEditBase.js | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Schema.js b/src/Schema.js index 7833fc0..42541e0 100644 --- a/src/Schema.js +++ b/src/Schema.js @@ -52,11 +52,13 @@ Ext.define('Proxmox.Schema', { // a singleton name: 'Sendmail', ipanel: 'pmxSendmailEditPanel', iconCls: 'fa-envelope-o', + defaultMailAuthor: 'Proxmox VE', }, smtp: { name: 'SMTP', ipanel: 'pmxSmtpEditPanel', iconCls: 'fa-envelope-o', + defaultMailAuthor: 'Proxmox VE', }, gotify: { name: 'Gotify', @@ -65,6 +67,13 @@ Ext.define('Proxmox.Schema', { // a singleton }, }, + // to add or change existing for product specific ones + overrideEndpointTypes: function(extra) { + for (const [key, value] of Object.entries(extra)) { + Proxmox.Schema.notificationEndpointTypes[key] = value; + } + }, + pxarFileTypes: { b: { icon: 'cube', label: gettext('Block Device') }, c: { icon: 'tty', label: gettext('Character Device') }, diff --git a/src/panel/SendmailEditPanel.js b/src/panel/SendmailEditPanel.js index 5a154c1..ccdfe98 100644 --- a/src/panel/SendmailEditPanel.js +++ b/src/panel/SendmailEditPanel.js @@ -58,8 +58,8 @@ Ext.define('Proxmox.panel.SendmailEditPanel', { fieldLabel: gettext('Author'), name: 'author', allowBlank: true, - emptyText: 'Proxmox VE', cbind: { + emptyText: '{defaultMailAuthor}', deleteEmpty: '{!isCreate}', }, }, diff --git a/src/panel/SmtpEditPanel.js b/src/panel/SmtpEditPanel.js index 8b258e0..edb6344 100644 --- a/src/panel/SmtpEditPanel.js +++ b/src/panel/SmtpEditPanel.js @@ -161,8 +161,8 @@ Ext.define('Proxmox.panel.SmtpEditPanel', { fieldLabel: gettext('Author'), name: 'author', allowBlank: true, - emptyText: gettext('Proxmox VE'), cbind: { + emptyText: '{defaultMailAuthor}', deleteEmpty: '{!isCreate}', }, }, diff --git a/src/window/EndpointEditBase.js b/src/window/EndpointEditBase.js index f42d0ea..993fa16 100644 --- a/src/window/EndpointEditBase.js +++ b/src/window/EndpointEditBase.js @@ -45,6 +45,7 @@ Ext.define('Proxmox.window.EndpointEditBase', { isCreate: me.isCreate, baseUrl: me.baseUrl, type: me.type, + defaultMailAuthor: endpointConfig.defaultMailAuthor, }], }); -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel