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 9EDBF1FF16F for ; Tue, 8 Jul 2025 20:07:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7C1E31E220; Tue, 8 Jul 2025 20:07:58 +0200 (CEST) Message-ID: Date: Tue, 8 Jul 2025 20:07:56 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox VE development discussion , Lukas Wagner References: <20250624112817.132312-1-l.wagner@proxmox.com> <20250624112817.132312-3-l.wagner@proxmox.com> Content-Language: en-US From: =?UTF-8?Q?Michael_K=C3=B6ppl?= In-Reply-To: <20250624112817.132312-3-l.wagner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH manager v2 2/2] ui: backup job details: show notification-mode instead of legacy keys 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" Just added a suggestion inline On 6/24/25 13:28, Lukas Wagner wrote: > The backup job details view was never updated after the overhaul of the > notification system. In this commit we remove the left-over > notification-policy/target handling and change the view so that we > display the current configuration based on notification-mode, mailto and > mailnotification. > > Signed-off-by: Lukas Wagner > --- > > Notes: > Changes since v1: > - Rebased onto latest master (PVE 9) > > www/manager6/dc/BackupJobDetail.js | 37 +++++++++++++++++------------- > 1 file changed, 21 insertions(+), 16 deletions(-) > > diff --git a/www/manager6/dc/BackupJobDetail.js b/www/manager6/dc/BackupJobDetail.js > index 58cb7bef..8d10a0da 100644 > --- a/www/manager6/dc/BackupJobDetail.js > +++ b/www/manager6/dc/BackupJobDetail.js > @@ -206,28 +206,33 @@ Ext.define('PVE.dc.BackupInfo', { > column2: [ > { > xtype: 'displayfield', > - name: 'notification-policy', > + name: 'notification-mode', > fieldLabel: gettext('Notification'), > renderer: function (value) { > + value = value ?? 'auto'; > let record = this.up('pveBackupInfo')?.record; > + let mailto = record?.mailto; > + let mailnotification = record?.mailnotification ?? 'always'; > > - // Fall back to old value, in case this option is not migrated yet. > - let policy = value || record?.mailnotification || 'always'; > + if ((value === 'auto' && mailto === undefined) || value === 'notification-system') { > + return gettext('Use global notification settings'); > + } else { > + if (mailto === undefined) { > + mailto = '-'; > + } > > - let when = gettext('Always'); > - if (policy === 'failure') { > - when = gettext('On failure only'); > - } else if (policy === 'never') { > - when = gettext('Never'); > + if (mailnotification === 'always') { > + return Ext.String.format( > + gettext('Always use sendmail to send an email to: {0}'), > + mailto, > + ); > + } else { > + return Ext.String.format( > + gettext('On failure, use sendmail to send an email to: {0}'), > + mailto, > + ); > + } Could maybe shorten this to return Ext.String.format( gettext((mailnotification === 'always' ? 'Always' : 'On failure,') + ' use sendmail to send an email to: {0}'), mailto, ); Admittedly, opinions might differ regarding readability. > } > - > - // Notification-target takes precedence > - let target = > - record?.['notification-target'] || > - record?.mailto || > - gettext('No target configured'); > - > - return `${when} (${target})`; > }, > }, > { _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel